From 3f35149d4f6326184ac0a8ef3ee3dc1c2799a3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Fri, 30 Sep 2022 15:45:08 +0200 Subject: [PATCH] qemu: convert some s390x tests to use real capability data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ján Tomko Reviewed-by: Michal Privoznik --- ... => balloon-ccw-deflate.s390x-latest.args} | 7 +++-- ...s => console-virtio-ccw.s390x-latest.args} | 9 ++++--- ...ev-subsys-mdev-vfio-ccw.s390x-latest.args} | 7 +++-- ...fio-zpci-ccw-memballoon.s390x-latest.args} | 7 +++-- ...othreads-disk-virtio-ccw.s390x-4.2.0.args} | 8 +++--- ....args => net-virtio-ccw.s390x-latest.args} | 7 +++-- ...> non-x86_64-timer-error.s390x-latest.err} | 0 ....args => virtio-rng-ccw.s390x-latest.args} | 9 +++++-- tests/qemuxml2argvtest.c | 27 ++++++------------- 9 files changed, 45 insertions(+), 36 deletions(-) rename tests/qemuxml2argvdata/{balloon-ccw-deflate.args => balloon-ccw-deflate.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{virtio-rng-ccw.args => console-virtio-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw.args => hostdev-subsys-mdev-vfio-ccw.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-ccw-memballoon.args => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args} (54%) rename tests/qemuxml2argvdata/{iothreads-disk-virtio-ccw.args => iothreads-disk-virtio-ccw.s390x-4.2.0.args} (79%) rename tests/qemuxml2argvdata/{net-virtio-ccw.args => net-virtio-ccw.s390x-latest.args} (73%) rename tests/qemuxml2argvdata/{non-x86_64-timer-error.err => non-x86_64-timer-error.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{console-virtio-ccw.args => virtio-rng-ccw.s390x-latest.args} (71%) diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args similarity index 68% rename from tests/qemuxml2argvdata/balloon-ccw-deflate.args rename to tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args index 558fd23a06..cff227c3ef 100644 --- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args +++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -26,4 +28,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,deflate-on-oom=on,devno=fe.0.000a \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/virtio-rng-ccw.args rename to tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args index a8de4a3789..d017e9a2bd 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -32,6 +34,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtconsole,chardev=charconsole0,id=console0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0002 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args similarity index 70% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args index 59e17b65fd..653fdb7c33 100644 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ +-cpu qemu \ -m 512 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":536870912}' \ -overcommit mem-lock=off \ -smp 2,sockets=2,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-ccw,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/90c6c135-ad44-41d0-b1b7-bae47de48627,devno=fe.0.0000 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args similarity index 54% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args index 95ab50cb92..8b4a1a3bff 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-KVMGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=KVMGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-KVMGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-KVMGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ +-cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-KVMGuest1/.config \ -device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \ -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args similarity index 79% rename from tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args rename to tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args index 4bd4749d2b..204a125b09 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.s390x-4.2.0.args @@ -10,8 +10,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -name guest=QEMUGuest1,debug-threads=on \ -S \ -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off \ -accel tcg \ +-cpu qemu \ -m 214 \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ @@ -28,10 +29,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=on \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ +-device virtio-blk-ccw,iothread=iothread1,scsi=off,devno=fe.0.0000,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,drive=libvirt-1-format,id=virtio-disk1 \ +-device virtio-blk-ccw,iothread=iothread2,scsi=off,devno=0.0.0007,drive=libvirt-1-format,id=virtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args similarity index 73% rename from tests/qemuxml2argvdata/net-virtio-ccw.args rename to tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args index f7cc0a8e7a..00a3ba6b5e 100644 --- a/tests/qemuxml2argvdata/net-virtio-ccw.args +++ b/tests/qemuxml2argvdata/net-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -30,4 +32,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:44:54,devno=fe.0.0000 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/non-x86_64-timer-error.err b/tests/qemuxml2argvdata/non-x86_64-timer-error.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/non-x86_64-timer-error.err rename to tests/qemuxml2argvdata/non-x86_64-timer-error.s390x-latest.err diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/console-virtio-ccw.args rename to tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args index f8e012f4b7..788bb1061f 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel tcg \ +-cpu qemu \ -m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":224395264}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ @@ -32,4 +34,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtconsole,chardev=charconsole0,id=console0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ +-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0002 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 52922f48a6..64ad473b0e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1305,7 +1305,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hugepages-nvdimm"); DO_TEST_NOCAPS("nosharepages"); - DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("non-x86_64-timer-error", "s390x"); DO_TEST_CAPS_LATEST("disk-cdrom"); DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid"); @@ -1530,7 +1530,7 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-device"); DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-virtio-netdev"); - DO_TEST("net-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); DO_TEST("net-virtio-rxtxqueuesize", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); @@ -1668,7 +1668,7 @@ mymain(void) DO_TEST_NOCAPS("console-virtio"); DO_TEST("console-virtio-many", QEMU_CAPS_DEVICE_ISA_SERIAL); - DO_TEST("console-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("console-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("console-virtio-unix"); DO_TEST_CAPS_ARCH_LATEST("console-sclp", "s390x"); DO_TEST("channel-spicevmc", @@ -1821,8 +1821,7 @@ mymain(void) DO_TEST_NOCAPS("balloon-device"); DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); - DO_TEST("balloon-ccw-deflate", - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); DO_TEST("balloon-mmio-deflate", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); @@ -1895,19 +1894,13 @@ mymain(void) DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-ccw-memballoon", - QEMU_CAPS_CCW, - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_NOCAPS("pci-rom-disabled"); DO_TEST_NOCAPS("pci-rom-disabled-invalid"); - DO_TEST("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_CCW_CSSID_UNRESTRICTED, - QEMU_CAPS_DEVICE_VFIO_CCW); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw", @@ -1963,8 +1956,7 @@ mymain(void) DO_TEST_CAPS_LATEST("iothreads-ids-pool-sizes"); DO_TEST_FAILURE_NOCAPS("iothreads-nocap"); DO_TEST("iothreads-disk", QEMU_CAPS_OBJECT_IOTHREAD); - DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_OBJECT_IOTHREAD, - QEMU_CAPS_CCW); + DO_TEST_CAPS_ARCH_VER("iothreads-disk-virtio-ccw", "s390x", "4.2.0"); DO_TEST_CAPS_VER("iothreads-virtio-scsi-pci", "5.2.0"); DO_TEST_CAPS_LATEST("iothreads-virtio-scsi-pci"); DO_TEST_CAPS_ARCH_LATEST("iothreads-virtio-scsi-ccw", "s390x"); @@ -2422,10 +2414,7 @@ mymain(void) DO_TEST_PARSE_ERROR("virtio-rng-egd-crash", QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_EGD); - DO_TEST("virtio-rng-ccw", - QEMU_CAPS_CCW, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x");