From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Wed, 23 Dec 2009 22:08:21 +0000 (+0100)
Subject: esx: Also allow virtualHW version 4 for ESX 4.0
X-Git-Tag: v0.7.6~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44112bce89a3212292bc24dfc535b5651c1cc1b1;p=thirdparty%2Flibvirt.git

esx: Also allow virtualHW version 4 for ESX 4.0

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.
---

diff --git a/src/esx/esx_vmx.c b/src/esx/esx_vmx.c
index 9aad592dce..d3cad1ddbb 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;
         }