summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDawid Zamirski <dzamirski@dattobackup.com>2014-03-27 18:26:04 -0400
committerMatthias Bolte <matthias.bolte@googlemail.com>2014-03-30 13:51:03 +0200
commit5cc3cce5cc81fc376b80225a723ea4ec21ff70d1 (patch)
treed8b70d63f7e8c4b814f9b361f61de868f2bf516a
parent8f21ae7046c5d7ed4b76ae757c5aa3e3a496d52d (diff)
downloadlibvirt-1.2.3-rc2.tar.gz
ESX: Add support for virtualHW version 10v1.2.3-rc2
This follows the same pattern when v8 and v9 were added. I've tested this with my ESX 5.5 and seems to work fine.
-rw-r--r--src/vmx/vmx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 32ddd05a3e..5dc99252b3 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -49,6 +49,7 @@ domain-xml <=> vmx
virtualHW.version = "7" # essential for ESX 4.0
virtualHW.version = "8" # essential for ESX 5.0
virtualHW.version = "9" # essential for ESX 5.1
+ virtualHW.version = "10" # essential for ESX 5.5
??? <=> guestOS = "<value>" # essential, FIXME: not representable
@@ -1316,10 +1317,11 @@ virVMXParseConfig(virVMXContext *ctx,
}
if (virtualHW_version != 4 && virtualHW_version != 7 &&
- virtualHW_version != 8 && virtualHW_version != 9) {
+ virtualHW_version != 8 && virtualHW_version != 9 &&
+ virtualHW_version != 10) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Expecting VMX entry 'virtualHW.version' to be "
- "4, 7, 8 or 9 but found %lld"),
+ "4, 7, 8, 9 or 10 but found %lld"),
virtualHW_version);
goto cleanup;
}