libvirt/tests/vmx2xmldata
Geoff Hickey 842f6fd338 esx: Fix floppy.fileName handling in the vmx file parser
The vmx file parsing code was reporting errors when parsing floppy.fileName
entries if the filename didn't end in .flp. There is no such restriction in
ESX; even using the GUI to configure floppy filenames you can specify any
arbitrary file with any extension.

Fix by changing the vmx parsing code so that it uses the floppy.fileType
value to determine whether floppy.fileName refers to a block device or a
regular file.

Also remove code that would have generated an error if no floppy.fileName
was specified. This is not an error either.

Updated the floppy tests in vmx2xmltest.c and xml2vmxtest.c.
2013-10-15 11:39:02 +01:00
..
vmx2xml-annotation.vmx esx: Map the .vmx annotation to the domain XML description 2010-08-30 22:22:03 +02:00
vmx2xml-annotation.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-case-insensitive-1.vmx vmx: Support persistent CPU shares 2011-04-05 08:40:57 +02:00
vmx2xml-case-insensitive-1.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-case-insensitive-2.vmx esx: Make the conf parser compare names case insensitive in VMX mode 2010-03-24 21:03:37 +01:00
vmx2xml-case-insensitive-2.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-cdrom-ide-device.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-cdrom-ide-device.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-cdrom-ide-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-cdrom-ide-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-cdrom-ide-raw-auto-detect.vmx VMX: Add support for 'auto detect' fileNames 2013-09-17 14:10:40 -05:00
vmx2xml-cdrom-ide-raw-auto-detect.xml VMX: Add support for 'auto detect' fileNames 2013-09-17 14:10:40 -05:00
vmx2xml-cdrom-ide-raw-device.vmx VMX: Add cdrom-raw dev type from VMWare Fusion 2013-09-02 17:41:30 -05:00
vmx2xml-cdrom-ide-raw-device.xml VMX: Add cdrom-raw dev type from VMWare Fusion 2013-09-02 17:41:30 -05:00
vmx2xml-cdrom-scsi-device.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-cdrom-scsi-device.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-cdrom-scsi-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-cdrom-scsi-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-cdrom-scsi-raw-auto-detect.vmx VMX: Add support for 'auto detect' fileNames 2013-09-17 14:10:40 -05:00
vmx2xml-cdrom-scsi-raw-auto-detect.xml VMX: Add support for 'auto detect' fileNames 2013-09-17 14:10:40 -05:00
vmx2xml-cdrom-scsi-raw-device.vmx VMX: Add cdrom-raw dev type from VMWare Fusion 2013-09-02 17:41:30 -05:00
vmx2xml-cdrom-scsi-raw-device.xml VMX: Add cdrom-raw dev type from VMWare Fusion 2013-09-02 17:41:30 -05:00
vmx2xml-esx-in-the-wild-1.vmx vmx: Support persistent CPU shares 2011-04-05 08:40:57 +02:00
vmx2xml-esx-in-the-wild-1.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-esx-in-the-wild-2.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-esx-in-the-wild-2.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-esx-in-the-wild-3.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-esx-in-the-wild-3.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-esx-in-the-wild-4.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-esx-in-the-wild-4.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-esx-in-the-wild-5.vmx esx: Add support for memtune/min_guarantee 2010-11-09 19:28:33 +01:00
vmx2xml-esx-in-the-wild-5.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-esx-in-the-wild-6.vmx esx: Fix regression in absolute file name handling 2011-05-26 23:32:44 +02:00
vmx2xml-esx-in-the-wild-6.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-bridged.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-ethernet-bridged.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-custom.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-ethernet-custom.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-e1000.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-ethernet-e1000.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-generated.vmx esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses 2010-01-07 01:38:19 +01:00
vmx2xml-ethernet-generated.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-nat.vmx vmx: Better Workstation vmx handling 2012-02-24 11:53:23 +01:00
vmx2xml-ethernet-nat.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-other.vmx esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses 2010-01-07 01:38:19 +01:00
vmx2xml-ethernet-other.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-static.vmx esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses 2010-01-07 01:38:19 +01:00
vmx2xml-ethernet-static.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-vmxnet2.vmx esx: Add support for the VMXNET 2 (Enhanced) NIC model 2010-04-20 20:58:24 +02:00
vmx2xml-ethernet-vmxnet2.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ethernet-vpx.vmx esx: Fix 'vpx' MAC address range and allow arbitrary MAC addresses 2010-01-07 01:38:19 +01:00
vmx2xml-ethernet-vpx.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-floppy-device.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-floppy-device.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-floppy-file.vmx esx: Fix floppy.fileName handling in the vmx file parser 2013-10-15 11:39:02 +01:00
vmx2xml-floppy-file.xml esx: Fix floppy.fileName handling in the vmx file parser 2013-10-15 11:39:02 +01:00
vmx2xml-fusion-in-the-wild-1.vmx VMX: Add a VMWare Fusion 5 configuration for tests 2013-09-17 14:10:41 -05:00
vmx2xml-fusion-in-the-wild-1.xml VMX: Add a VMWare Fusion 5 configuration for tests 2013-09-17 14:10:41 -05:00
vmx2xml-graphics-vnc.vmx esx: Add VNC support 2010-01-18 01:44:20 +01:00
vmx2xml-graphics-vnc.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-gsx-in-the-wild-1.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-gsx-in-the-wild-1.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-gsx-in-the-wild-2.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-gsx-in-the-wild-2.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-gsx-in-the-wild-3.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-gsx-in-the-wild-3.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-gsx-in-the-wild-4.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-gsx-in-the-wild-4.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-harddisk-ide-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-harddisk-ide-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-harddisk-scsi-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-harddisk-scsi-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-minimal-64bit.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-minimal-64bit.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-minimal.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-minimal.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-parallel-device.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-parallel-device.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-parallel-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-parallel-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-scsi-driver.vmx esx: Allow 'vmpvscsi' as SCSI controller model 2010-07-24 17:31:04 +02:00
vmx2xml-scsi-driver.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-scsi-writethrough.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-scsi-writethrough.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-serial-device.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-device.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-serial-file.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-file.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-serial-network-client.vmx esx: Add support for virtual serial device network backing 2010-10-01 23:38:23 +02:00
vmx2xml-serial-network-client.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-serial-network-server.vmx esx: Add support for virtual serial device network backing 2010-10-01 23:38:23 +02:00
vmx2xml-serial-network-server.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-serial-pipe-client-app.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-pipe-client-vm.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-pipe-server-app.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-pipe-server-vm.vmx ESX add tests for the VMX to/from domain XML mapping 2009-09-23 15:00:54 +02:00
vmx2xml-serial-pipe.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-sharedfolder.vmx vmx: handle shared folders parsing 2012-07-21 20:15:02 +02:00
vmx2xml-sharedfolder.xml vmx: handle shared folders parsing 2012-07-21 20:15:02 +02:00
vmx2xml-smbios.vmx esx: Support SMBIOS host mode 2010-11-11 19:18:19 +01:00
vmx2xml-smbios.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-svga.vmx vmx: Add support for video device VRAM size 2011-01-06 18:18:35 +01:00
vmx2xml-svga.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ws-in-the-wild-1.vmx vmx: Better Workstation vmx handling 2012-02-24 11:53:23 +01:00
vmx2xml-ws-in-the-wild-1.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00
vmx2xml-ws-in-the-wild-2.vmx vmx: Better Workstation vmx handling 2012-02-24 11:53:23 +01:00
vmx2xml-ws-in-the-wild-2.xml numad: Always output 'placement' of <vcpu> 2012-05-08 16:57:37 -06:00