On 28.08.2013 23:53, Doug Goldstein wrote: > A user came into #virt the other day and was trying to get libvirtd > to work with VMWare Fusion 5, which is basically the Mac OS X version of > VMWare Workstation. In helping him out I noticed a few limitations of our > VMX parser so I've added support through this patchset. However I came > across the fact that we only support 2 types of CD-ROMs instead of the 3 > types that VMWare has lead to adding support for a <driver> element to > CD-ROM drives. > > v3: > * Dropped 'auto detect' support from series as it needs more work based on > feedback > * Added patch to combine virVMXFormatHardDisk and virVMXFormatCDROM into > one function. > * Converted to <disk type='block' device='lun'> instead of adding a > <driver> element to better match the behavior available via QEMU. > > v2: > * Added additional test cases and fixed issues that arose from those > > Doug Goldstein (4): > VMX: Create virVMXFormatDisk() from HD and CD-ROM > VMX: Add cdrom-raw dev type from VMWare Fusion > VMX: Add a VMWare Fusion 5 configuration for tests > VMX: Some serial ports are not actually connected > > docs/formatdomain.html.in | 3 +- > src/libvirt_vmx.syms | 3 +- > src/vmx/vmx.c | 216 ++++++++------------- > src/vmx/vmx.h | 5 +- > tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx | 5 + > tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml | 24 +++ > .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx | 6 + > .../vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml | 24 +++ > tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx | 88 +++++++++ > tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 38 ++++ > tests/vmx2xmltest.c | 4 + > tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx | 13 ++ > tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml | 14 ++ > .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx | 14 ++ > .../xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml | 14 ++ > tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx | 30 +++ > tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 40 ++++ > tests/xml2vmxtest.c | 4 + > 18 files changed, 400 insertions(+), 145 deletions(-) > create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.vmx > create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-ide-raw-device.xml > create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.vmx > create mode 100644 tests/vmx2xmldata/vmx2xml-cdrom-scsi-raw-device.xml > create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.vmx > create mode 100644 tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml > create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.vmx > create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-ide-raw-device.xml > create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.vmx > create mode 100644 tests/xml2vmxdata/xml2vmx-cdrom-scsi-raw-device.xml > create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.vmx > create mode 100644 tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml > I've ACKed all except 3/4. However, I think you should wait with push since we are already in the freeze. Michal -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list