[libvirt] [PATCH] esx: Also allow virtualHW version 4 for ESX 4.0

[Daniel Veillard]

On Sun, Jan 03, 2010 at 08:38:17PM +0100, Matthias Bolte wrote:
> A domain with virtualHW version 4 is allowed on an ESX 4.0 server.
> If a domain is migrated from an ESX 3.5 server to an ESX 4.0 server
> then the virtualHW version stays the same. So a ESX 4.0 server can
> host domains with virtualHW version 4.
> ---
>  src/esx/esx_vmx.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
> index 9aad592..d3cad1d 100644
> --- a/src/esx/esx_vmx.c
> +++ b/src/esx/esx_vmx.c
> @@ -780,9 +780,9 @@ esxVMX_ParseConfig(virConnectPtr conn, esxVI_Context *ctx, const char *vmx,
>          break;
>  
>        case esxVI_APIVersion_40:
> -        if (virtualHW_version != 7) {
> +        if (virtualHW_version != 4 && virtualHW_version != 7) {
>              ESX_ERROR(conn, VIR_ERR_INTERNAL_ERROR,
> -                      "Expecting VMX entry 'virtualHW.version' to be 7 for "
> +                      "Expecting VMX entry 'virtualHW.version' to be 4 or 7 for "
>                        "VI API version 4.0 but found %lld", virtualHW_version);
>              goto failure;
>          }

  ACK,

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/