In effor to convert all test cases to real capability testing, this
test doesn't make sense any more as even the oldest QEMU supported
supports USB storage.
Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
tests/qemuxml2argvdata/disk-usb-nosupport.err | 1 -
tests/qemuxml2argvdata/disk-usb-nosupport.xml | 35 -------------------
tests/qemuxml2argvtest.c | 1 -
3 files changed, 37 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.err
delete mode 100644 tests/qemuxml2argvdata/disk-usb-nosupport.xml
diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.err b/tests/qemuxml2argvdata/disk-usb-nosupport.err
deleted file mode 100644
index 87e8a9dec3..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-nosupport.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: This QEMU doesn't support '-device usb-storage'
diff --git a/tests/qemuxml2argvdata/disk-usb-nosupport.xml b/tests/qemuxml2argvdata/disk-usb-nosupport.xml
deleted file mode 100644
index b88ecf1935..0000000000
--- a/tests/qemuxml2argvdata/disk-usb-nosupport.xml
+++ /dev/null
@@ -1,35 +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-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>
- <disk type='file' device='disk'>
- <driver name='qemu' type='raw'/>
- <source file='/tmp/usbdisk.img'/>
- <target dev='sda' bus='usb'/>
- </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 6ec486bdfc..fa58c7d0ef 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1376,7 +1376,6 @@ mymain(void)
DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
- DO_TEST_PARSE_ERROR_NOCAPS("disk-usb-nosupport");
DO_TEST("disk-usb-device",
QEMU_CAPS_DEVICE_USB_STORAGE);
DO_TEST("disk-usb-device-removable",
--
2.31.1
