[libvirt] [PATCH v2 21/32] tests: qemuxml2argv: Remove 'disk-virtio-scsi-ccw' test
It's a subset of 'iothreads-virtio-scsi-ccw'.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../disk-virtio-scsi-ccw.args | 29 -----------------
.../qemuxml2argvdata/disk-virtio-scsi-ccw.xml | 31 -------------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 62 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.args
deleted file mode 100644
index 66d3cbf47a..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.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-s390x \
--name QEMUGuest1 \
--S \
--machine s390-ccw,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 \
--device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,\
-id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-scsi0-0-4-0 \
--device scsi-disk,bus=scsi0.0,channel=0,scsi-id=4,lun=0,\
-drive=drive-scsi0-0-4-0,id=scsi0-0-4-0 \
--device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
b/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
deleted file mode 100644
index 1938b3eaab..0000000000
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-ccw.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<domain type='qemu'>
- <name>QEMUGuest1</name>
- <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory>219136</memory>
- <currentMemory>219136</currentMemory>
- <vcpu>1</vcpu>
- <os>
- <type arch='s390x' machine='s390-ccw'>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-s390x</emulator>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/QEMUGuest1'/>
- <target dev='vda' bus='virtio'/>
- </disk>
- <disk type='block' device='disk'>
- <source dev='/dev/HostVG/QEMUGuest2'/>
- <target dev='sda' bus='scsi'/>
- <address type='drive' controller='0' bus='0'
target='4' unit='0'/>
- </disk>
- <controller type='scsi' index='0'
model='virtio-scsi'/>
- <memballoon model='virtio'>
- <address type='ccw' cssid='0xFe' ssid='0x0'
devno='0xA'/>
- </memballoon>
- </devices>
-</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index acdf750102..3c9491982b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1036,8 +1036,6 @@ mymain(void)
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("disk-virtio-ccw-many",
QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
- DO_TEST("disk-virtio-scsi-ccw", QEMU_CAPS_VIRTIO_SCSI,
- QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_S390);
DO_TEST("disk-virtio-s390-zpci",
QEMU_CAPS_DEVICE_ZPCI,
QEMU_CAPS_CCW,
--
2.20.1