[libvirt] [PATCH] esx: Move VMX handling code out of the driver directory

Matthias Bolte matthias.bolte at googlemail.com
Tue Dec 21 21:46:45 UTC 2010


2010/12/21 Eric Blake <eblake at redhat.com>:
> On 12/21/2010 09:03 AM, Matthias Bolte wrote:
>> Now the VMware driver doesn't depend on the ESX driver anymore.
>>
>> Add a WITH_VMX option that depends on WITH_ESX and WITH_VMWARE.
>> Also add a libvirt_vmx.syms file.
>>
>> Move some escaping functions from esx_util.c to vmx.c.
>>
>> Adapt the test suite, ESX and VMware driver to the new code layout.
>
>> --- a/src/esx/esx_driver.c
>
>> @@ -88,7 +88,7 @@ struct _esxVMX_Data {
>>   * Firstly this functions checks if the given file name contains a separator.
>>   * If it doesn't then the referenced file is in the same directory as the .vmx
>>   * file. The datastore name and directory of the .vmx file are passed to this
>> - * function via the opaque paramater by the caller of esxVMX_ParseConfig.
>> + * function via the opaque paramater by the caller of virVMXParseConfig.
>
> As long as you're touching this line, s/paramater/parameter/

One of my typical typos, fixed now :)

>> +++ b/src/libvirt_vmx.syms
>> @@ -0,0 +1,23 @@
>> +#
>> +# These symbols are dependent upon --with-esx via WITH_ESX or --with-vmware via WITH_VMWARE.
>> +#
>> +
>> +# vmx.h
>> +virVMXConvertToUTF8;
>> +virVMXEscapeHex;
>> +virVMXUnescapeHex;
>> +virVMXParseConfig;
>
> Do you want to sort this list?

I intended to do so but forgot about it before posting. It's sorted now.

>> diff --git a/src/esx/esx_vmx.c b/src/vmx/vmx.c
>> similarity index 79%
>> rename from src/esx/esx_vmx.c
>> rename to src/vmx/vmx.c
>> index 5cbb835..6e3e9af 100644
>
> 'git diff' is so awesome with renames :)
>
>> @@ -454,19 +456,23 @@ def->parallels[0]...
>>
>>  */
>>
>> -#define VIR_FROM_THIS VIR_FROM_ESX
>> +#define VIR_FROM_THIS VIR_FROM_NONE
>
> Bit of a shame that we lose information here, but not the end of the world.
>
> ACK with the spelling and sorting nits addressed.
>

Thanks, pushed.

Matthias




More information about the libvir-list mailing list