[libvirt] [PATCH 01/10] tests: Drop tests enabling allowDiskFormatProbing

Format probing will be dropped so remove the tests which will become obsolete. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../qemuxml2argvdata/disk-many-format-probing.args | 32 ------------- .../qemuxml2argvdata/disk-many-format-probing.xml | 48 -------------------- tests/qemuxml2argvtest.c | 6 --- .../disk-many-format-probing.xml | 52 ---------------------- tests/qemuxml2xmltest.c | 6 --- 5 files changed, 144 deletions(-) delete mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.args delete mode 100644 tests/qemuxml2argvdata/disk-many-format-probing.xml delete mode 100644 tests/qemuxml2xmloutdata/disk-many-format-probing.xml diff --git a/tests/qemuxml2argvdata/disk-many-format-probing.args b/tests/qemuxml2argvdata/disk-many-format-probing.args deleted file mode 100644 index 8980b80f92..0000000000 --- a/tests/qemuxml2argvdata/disk-many-format-probing.args +++ /dev/null @@ -1,32 +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,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/HostVG/QEMUGuest2,if=none,id=drive-ide0-0-1 \ --device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \ --drive file=/tmp/data.img,if=none,id=drive-ide0-1-0 \ --device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \ --drive file=/tmp/logs.img,if=none,id=drive-ide0-1-1 \ --device ide-drive,bus=ide.1,unit=1,drive=drive-ide0-1-1,id=ide0-1-1 diff --git a/tests/qemuxml2argvdata/disk-many-format-probing.xml b/tests/qemuxml2argvdata/disk-many-format-probing.xml deleted file mode 100644 index 5e34eb46e0..0000000000 --- a/tests/qemuxml2argvdata/disk-many-format-probing.xml +++ /dev/null @@ -1,48 +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'> - <driver name='qemu'/> - <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='disk'> - <driver name='qemu'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu'/> - <source file='/tmp/data.img'/> - <target dev='hdc' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu'/> - <source file='/tmp/logs.img'/> - <target dev='hdd' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 14a994523f..0f859ca3bc 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2848,12 +2848,6 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations"); - /* Test disks with format probing enabled for legacy reasons. - * New tests should not go in this section. */ - driver.config->allowDiskFormatProbing = true; - DO_TEST("disk-many-format-probing", QEMU_CAPS_DRIVE_BOOT); - driver.config->allowDiskFormatProbing = false; - DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, diff --git a/tests/qemuxml2xmloutdata/disk-many-format-probing.xml b/tests/qemuxml2xmloutdata/disk-many-format-probing.xml deleted file mode 100644 index 914b9b0937..0000000000 --- a/tests/qemuxml2xmloutdata/disk-many-format-probing.xml +++ /dev/null @@ -1,52 +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'> - <driver name='qemu'/> - <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='disk'> - <driver name='qemu'/> - <source dev='/dev/HostVG/QEMUGuest2'/> - <target dev='hdb' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='1'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu'/> - <source file='/tmp/data.img'/> - <target dev='hdc' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <disk type='file' device='disk'> - <driver name='qemu'/> - <source file='/tmp/logs.img'/> - <target dev='hdd' bus='ide'/> - <address type='drive' controller='0' bus='1' target='0' unit='1'/> - </disk> - <controller type='usb' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='0' model='pci-root'/> - <input type='mouse' bus='ps2'/> - <input type='keyboard' bus='ps2'/> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index f53f9a7db5..a6be502cf7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1183,12 +1183,6 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); - /* Test disks with format probing enabled for legacy reasons. - * New tests should not go in this section. */ - driver.config->allowDiskFormatProbing = true; - DO_TEST("disk-many-format-probing", NONE); - driver.config->allowDiskFormatProbing = false; - # define DO_TEST_STATUS(name) \ do { \ if (testInfoSetStatus(&info, name, GIC_NONE) < 0) { \ -- 2.16.2