[libvirt] [PATCH] vmx: Fix a VMX parsing problem.

Eric Blake eblake at redhat.com
Thu Jan 8 00:10:13 UTC 2015


On 01/07/2015 04:45 PM, Geoff Hickey wrote:
> VMware ESX does not always set the "serialX.fileType" tag in VMX files. The
> default value for this tag is "device", and when adding a new serial port
> of this type VMware will omit the fileType tag. This caused libvirt to
> fail to parse the VMX file. Fixed by making this tag optional and using
> "device" as a default value. Also updated vmx2xmltest to test for this
> case.

Thanks for tackling the testsuite, too :)

> 
> Conflicts:
> 	src/vmx/vmx.c

The conflicts marker is generally only useful for downstream builds that
cherry-pick patches.  For upstream, we don't need it.

> ---
>  src/vmx/vmx.c                               | 10 +++++++---
>  tests/vmx2xmldata/vmx2xml-serial-device.vmx |  2 ++
>  tests/vmx2xmldata/vmx2xml-serial-device.xml |  4 ++++
>  3 files changed, 13 insertions(+), 3 deletions(-)

ACK, and will push shortly, with amended message.


-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20150107/0c14dc50/attachment-0001.sig>


More information about the libvir-list mailing list