External/libvirt
1
0
Fork 0
Code

esx: Support virtualHW version 9

Browse Source 
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
This commit is contained in:
Martin Kletzander 2013-04-30 14:46:54 +02:00
parent a6a10a52eb
commit e0eb672e00
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/vmx/vmx.c
View File

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