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 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - -
- - - - - -
- - - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index cd103b6506..b0490aea55 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2852,12 +2852,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 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219136 - 219136 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - - - - -
- - - - - -
- - - - - -
- - -
- - -
- - - - - - - diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 115db6e64b..689c002b7e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1184,12 +1184,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) { \