]> xenbits.xensource.com Git - libvirt.git/commitdiff
esx: Support virtualHW version 9
authorMartin Kletzander <mkletzan@redhat.com>
Tue, 30 Apr 2013 12:46:54 +0000 (14:46 +0200)
committerMartin Kletzander <mkletzan@redhat.com>
Tue, 30 Apr 2013 14:32:06 +0000 (16:32 +0200)
We already support ESX 5.1, but virtualHW version used by such
hypervisor [1] wasn't taken into account.

[1] http://kb.vmware.com/selfservice/microsites/search.do?cmd=displayKC&externalId=1003746

src/vmx/vmx.c

index f520a85e72d6d056e63cfd8f6a9454a2a81ab98a..87bec5beb8918e068b51e4f01243872b10a087e9 100644 (file)
@@ -1,8 +1,7 @@
-
 /*
  * vmx.c: VMware VMX parsing/formatting functions
  *
- * Copyright (C) 2010-2012 Red Hat, Inc.
+ * Copyright (C) 2010-2013 Red Hat, Inc.
  * Copyright (C) 2009-2010 Matthias Bolte <matthias.bolte@googlemail.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -45,6 +44,7 @@ domain-xml                        <=>   vmx
                                         virtualHW.version = "4"                 # essential for ESX 3.5
                                         virtualHW.version = "7"                 # essential for ESX 4.0
                                         virtualHW.version = "8"                 # essential for ESX 5.0
+                                        virtualHW.version = "9"                 # essential for ESX 5.1
 
 
 ???                               <=>   guestOS = "<value>"                     # essential, FIXME: not representable
@@ -1320,10 +1320,10 @@ virVMXParseConfig(virVMXContext *ctx,
     }
 
     if (virtualHW_version != 4 && virtualHW_version != 7 &&
-        virtualHW_version != 8) {
+        virtualHW_version != 8 && virtualHW_version != 9) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("Expecting VMX entry 'virtualHW.version' to be 4, 7 or 8 "
-                         "but found %lld"),
+                       _("Expecting VMX entry 'virtualHW.version' to be "
+                         "4, 7, 8 or 9 but found %lld"),
                        virtualHW_version);
         goto cleanup;
     }