[libvirt] [PATCH 04/24] tests: qemuxml2argv: Remove tests obsoleted by assuming support for '-device'

Few disk tests were testing support for pure -drive command line generation for disks now that we assume it for all qemu versions the cases are obsolete. Replacements: disk-readonly-no-device -> disk-readonly-disk disk-floppy-tray-no-device -> disk-floppy-tray disk-cdrom-tray-no-device -> disk-cdrom-tray Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../disk-cdrom-tray-no-device-cap.args | 29 ----------------- .../disk-cdrom-tray-no-device-cap.xml | 32 ------------------- .../disk-floppy-tray-no-device-cap.args | 31 ------------------ .../disk-floppy-tray-no-device-cap.xml | 37 ---------------------- .../qemuxml2argvdata/disk-readonly-no-device.args | 30 ------------------ tests/qemuxml2argvdata/disk-readonly-no-device.xml | 32 ------------------- tests/qemuxml2argvtest.c | 3 -- 7 files changed, 194 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.args delete mode 100644 tests/qemuxml2argvdata/disk-readonly-no-device.xml diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args b/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args deleted file mode 100644 index b9bdb6443f..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive if=none,id=drive-ide0-1-0,media=cdrom,readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml b/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml deleted file mode 100644 index 77e64448f6..0000000000 --- a/tests/qemuxml2argvdata/disk-cdrom-tray-no-device-cap.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <source file='/root/boot.iso'/> - <target dev='hdc' bus='ide' tray='open'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args b/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args deleted file mode 100644 index a3c6881e98..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \ --global isa-fdc.driveA=drive-fdc0-0-0 \ --drive if=none,id=drive-fdc0-0-1 \ --global isa-fdc.driveB=drive-fdc0-0-1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml b/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml deleted file mode 100644 index 4b9bc1b6c9..0000000000 --- a/tests/qemuxml2argvdata/disk-floppy-tray-no-device-cap.xml +++ /dev/null @@ -1,37 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='floppy'> - <source dev='/dev/fd0'/> - <target dev='fda' bus='fdc' tray='closed'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='floppy'> - <source file='/tmp/firmware.img'/> - <target dev='fdb' bus='fdc' tray='open'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'/> - <controller type='fdc' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/disk-readonly-no-device.args b/tests/qemuxml2argvdata/disk-readonly-no-device.args deleted file mode 100644 index 399a929f0b..0000000000 --- a/tests/qemuxml2argvdata/disk-readonly-no-device.args +++ /dev/null @@ -1,30 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/home/test \ -USER=test \ -LOGNAME=test \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-i686 \ --name QEMUGuest1 \ --S \ --machine pc,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ -server,nowait \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --no-acpi \ --boot c \ --usb \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \ --device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \ --drive file=/dev/sr0,format=raw,if=none,id=drive-ide0-1-0,media=cdrom,\ -readonly=on \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/disk-readonly-no-device.xml b/tests/qemuxml2argvdata/disk-readonly-no-device.xml deleted file mode 100644 index 137ab0a923..0000000000 --- a/tests/qemuxml2argvdata/disk-readonly-no-device.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-i686</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='block' device='cdrom'> - <source dev='/dev/sr0'/> - <target dev='hdc' bus='ide'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8f9dd53214..4bf826177f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -998,11 +998,9 @@ mymain(void) DO_TEST("disk-cdrom-empty", NONE); DO_TEST("disk-cdrom-tray", QEMU_CAPS_VIRTIO_TX_ALG); - DO_TEST("disk-cdrom-tray-no-device-cap", NONE); DO_TEST("disk-floppy", NONE); DO_TEST_FAILURE("disk-floppy-pseries", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); - DO_TEST("disk-floppy-tray-no-device-cap", NONE); DO_TEST("disk-floppy-tray", NONE); DO_TEST("disk-virtio-s390", QEMU_CAPS_VIRTIO_S390); @@ -1025,7 +1023,6 @@ mymain(void) DO_TEST("floppy-drive-fat", QEMU_CAPS_DRIVE_BOOT); DO_TEST("disk-readonly-disk", NONE); - DO_TEST("disk-readonly-no-device", NONE); DO_TEST("disk-fmt-qcow", QEMU_CAPS_DRIVE_BOOT); DO_TEST_PARSE_ERROR("disk-fmt-cow", QEMU_CAPS_DRIVE_BOOT); -- 2.16.2