[libvirt] [PATCH] esx: Support virtualHW version 9

[Martin Kletzander]

On 04/30/2013 04:51 PM, Richard W.M. Jones wrote:
> On Tue, Apr 30, 2013 at 03:53:33PM +0200, Martin Kletzander wrote:
>> 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
>>
>> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
>> ---
>>  src/vmx/vmx.c | 10 +++++-----
>>  1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
>> index f520a85..87bec5b 100644
>> --- a/src/vmx/vmx.c
>> +++ b/src/vmx/vmx.c
>> @@ -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 at 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;
>>      }
>> -- 
>> 1.8.2.1
> 
> ACK.
> 

Thanks, pushed.

> But ...
> 
> We (v2v) would love this test to simply produce a warning and
> not be a hard error.
> 

I don't think it's that easy.  There are versions that may result in
other errors.  Old versions may have changed even the ABI and for
example version 6 is used only on Workstation.

Don't get me wrong, I would love to turn this error into a warning, but
I don't have that much experience with ESX to say that it won't turn out
to be more pain than pleasure.  However, if you say so, I'll go through
the code and see what version checks can be turned to warnings.  We
already have that implemented for some checks (like ESX major/minor
version).

I'll push this one since it's a bit different issue than the warnings
and hope that we'll come co a conclusion about the warnings.

Martin