All supported QEMU versions now support iothreads thus upcoming patches
will be removing the capability checks. Remove the 'iothreads-nocap'
case which will become invalid.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvdata/iothreads-nocap.err | 1 -
tests/qemuxml2argvdata/iothreads-nocap.xml | 37 ----------------------
tests/qemuxml2argvtest.c | 1 -
3 files changed, 39 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/iothreads-nocap.err
delete mode 100644 tests/qemuxml2argvdata/iothreads-nocap.xml
diff --git a/tests/qemuxml2argvdata/iothreads-nocap.err b/tests/qemuxml2argvdata/iothreads-nocap.err
deleted file mode 100644
index ed2f47ecd5..0000000000
--- a/tests/qemuxml2argvdata/iothreads-nocap.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: IOThreads not supported for this QEMU
diff --git a/tests/qemuxml2argvdata/iothreads-nocap.xml b/tests/qemuxml2argvdata/iothreads-nocap.xml
deleted file mode 100644
index fa04d735cd..0000000000
--- a/tests/qemuxml2argvdata/iothreads-nocap.xml
+++ /dev/null
@@ -1,37 +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'>2</vcpu>
- <iothreads>4</iothreads>
- <iothreadids>
- <iothread id='5'/>
- <iothread id='6'/>
- </iothreadids>
- <cputune>
- <iothreadpin iothread='5' cpuset='2'/>
- <iothreadpin iothread='6' cpuset='1'/>
- </cputune>
- <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-i386</emulator>
- <disk type='block' device='disk'>
- <driver name='qemu' type='raw'/>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='hda' bus='ide'/>
- <address type='drive' controller='0' bus='0' target='0' unit='0'/>
- </disk>
- <controller type='usb' index='0'/>
- <controller type='ide' index='0'/>
- <controller type='pci' index='0' model='pci-root'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5a33c336c8..1956e6da08 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1887,7 +1887,6 @@ mymain(void)
DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
DO_TEST("iothreads-ids-partial", QEMU_CAPS_OBJECT_IOTHREAD);
DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes");
- DO_TEST_FAILURE_NOCAPS("iothreads-nocap");
DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD);
DO_TEST_CAPS_ARCH_VER("iothreads-disk-virtio-ccw", "s390x", "4.2.0");
DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0");
--
2.39.2
