Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- ... => 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"); -- 2.37.3

Introduced in libvirt by: commit f245a9791c23ba08858f7cf7b16b1c449967ab35 qemu: introduce capability for virtual-css-bridge Which mentions that its support was in QEMU 2.7. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 7 --- src/qemu/qemu_domain_address.c | 7 +-- src/qemu/qemu_hotplug.c | 6 +- src/qemu/qemu_validate.c | 6 -- tests/qemuhotplugtest.c | 1 - .../hostdev-vfio-zpci-boundaries.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 3 +- tests/qemuxml2argvtest.c | 61 ++++++------------- .../hostdev-vfio-zpci-autogenerate-fids.xml | 4 +- .../hostdev-vfio-zpci-autogenerate-uids.xml | 4 +- .../hostdev-vfio-zpci-autogenerate.xml | 4 +- .../hostdev-vfio-zpci-boundaries.xml | 4 +- .../hostdev-vfio-zpci-multidomain-many.xml | 4 +- tests/qemuxml2xmltest.c | 39 +++++------- 14 files changed, 46 insertions(+), 109 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f8521587a9..d254f38f92 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5242,13 +5242,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); } - if (ARCH_IS_S390(qemuCaps->arch)) { - /* Legacy assurance for QEMU_CAPS_CCW */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_CCW)) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_CCW); - } - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES)) virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 228ac07cd5..d8ec6ec71c 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -420,8 +420,7 @@ qemuDomainAssignS390Addresses(virDomainDef *def, int ret = -1; virDomainCCWAddressSet *addrs = NULL; - if (qemuDomainIsS390CCW(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { + if (qemuDomainIsS390CCW(def)) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VFIO_CCW)) qemuDomainPrimeVfioDeviceAddresses(def, VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW); @@ -3289,13 +3288,11 @@ qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainDeviceDef *dev) { virDomainDeviceInfo *info = virDomainDeviceGetInfo(dev); - qemuDomainObjPrivate *priv = vm->privateData; virDomainCCWAddressSet *ccwaddrs = NULL; int ret = -1; if (!info->type) { - if (qemuDomainIsS390CCW(vm->def) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) + if (qemuDomainIsS390CCW(vm->def)) info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9b508dc8f0..00727f6ddc 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1143,8 +1143,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver, } if (qemuDomainIsS390CCW(vm->def) && - net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) { + net->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) { net->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; if (!(ccwaddrs = virDomainCCWAddressSetCreateFromDomain(vm->def))) goto cleanup; @@ -2571,8 +2570,7 @@ qemuDomainAttachSCSIVHostDevice(virQEMUDriver *driver, vhostfdName = g_strdup_printf("vhostfd-%d", vhostfd); if (hostdev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { - if (qemuDomainIsS390CCW(vm->def) && - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CCW)) + if (qemuDomainIsS390CCW(vm->def)) hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW; } diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 34fa10ae32..cb4e32c0ff 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1655,12 +1655,6 @@ qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev, return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CCW)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("CCW address type is not supported by this QEMU")); - return -1; - } - break; case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE: diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index e59158dca0..163b5e8091 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -75,7 +75,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt, virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE); - virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_PLAIN); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL); virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_SCSI_DISK_WWN); diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args index 62b2472959..ca31f35d75 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args @@ -24,13 +24,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --device zpci,uid=3,fid=2,target=pci.1,id=zpci3 \ +-device zpci,uid=2,fid=1,target=pci.1,id=zpci2 \ -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device zpci,uid=65535,fid=4294967295,target=hostdev0,id=zpci65535 \ -device vfio-pci,host=ffff:00:00.0,id=hostdev0,bus=pci.1,addr=0x1f \ -device zpci,uid=1,fid=0,target=hostdev1,id=zpci1 \ -device vfio-pci,host=0000:00:00.0,id=hostdev1,bus=pci.0,addr=0x2 \ --device zpci,uid=2,fid=1,target=balloon0,id=zpci2 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args index 9df47029be..e19c848aa8 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args @@ -27,6 +27,5 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device zpci,uid=25,fid=31,target=hostdev0,id=zpci25 \ -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x8 \ --device zpci,uid=1,fid=0,target=balloon0,id=zpci1 \ --device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x1 \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d1cd1456a0..b96ec69fa7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1903,13 +1903,10 @@ mymain(void) 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", - QEMU_CAPS_CCW); + DO_TEST_PARSE_ERROR_NOCAPS("hostdev-subsys-mdev-vfio-ccw"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", @@ -2009,7 +2006,7 @@ mymain(void) DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM, QEMU_CAPS_CCW); + DO_TEST("cpu-s390-zEC12", QEMU_CAPS_KVM); DO_TEST("cpu-s390-features", QEMU_CAPS_KVM, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION); DO_TEST_FAILURE("cpu-s390-features", QEMU_CAPS_KVM); qemuTestSetHostArch(&driver, VIR_ARCH_NONE); @@ -2416,17 +2413,15 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x"); - DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); - DO_TEST_PARSE_ERROR("s390-panic-address", QEMU_CAPS_CCW); - DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); - DO_TEST_PARSE_ERROR("s390-no-parallel", QEMU_CAPS_CCW); - DO_TEST("s390-serial", QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST_NOCAPS("s390-panic-no-address"); + DO_TEST_PARSE_ERROR_NOCAPS("s390-panic-address"); + DO_TEST_NOCAPS("s390-panic-missing"); + DO_TEST_PARSE_ERROR_NOCAPS("s390-no-parallel"); + DO_TEST("s390-serial", QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("s390-serial-2", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE, QEMU_CAPS_DEVICE_SCLPLMCONSOLE); DO_TEST("s390-serial-console", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_SCLPCONSOLE); DO_TEST("ppc-dtb", @@ -2630,8 +2625,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -2889,66 +2883,51 @@ mymain(void) DO_TEST("machine-aeskeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-aeskeywrap-on-cap", QEMU_CAPS_AES_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-aeskeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-aeskeywrap-off-cap", QEMU_CAPS_AES_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-deakeywrap-on-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-deakeywrap-on-cap", QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-deakeywrap-off-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-deakeywrap-off-cap", QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-keywrap-none-caps", QEMU_CAPS_AES_KEY_WRAP, QEMU_CAPS_DEA_KEY_WRAP, - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-keywrap-none", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST("machine-loadparm-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-net-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST("machine-loadparm-multiple-disks-nets-s390", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-char-invalid", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST_PARSE_ERROR("machine-loadparm-s390-len-invalid", - QEMU_CAPS_CCW, QEMU_CAPS_LOADPARM); DO_TEST_NOCAPS("qemu-ns-domain-ns0"); @@ -3106,12 +3085,12 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx"); DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-invalid-size"); - DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_CCW, + DO_TEST("video-virtio-gpu-ccw", QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); - DO_TEST("input-virtio-ccw", QEMU_CAPS_CCW, + DO_TEST("input-virtio-ccw", QEMU_CAPS_VIRTIO_KEYBOARD, QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml index 594be6a6b7..cc3687db95 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml @@ -35,9 +35,7 @@ </address> </hostdev> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'> - <zpci uid='0x0002' fid='0x00000002'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml index b0ec9850ee..5b03616d1e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml @@ -35,9 +35,7 @@ </address> </hostdev> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'> - <zpci uid='0x0003' fid='0x00000001'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml index 3cf7ada929..acee69fd86 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml @@ -26,9 +26,7 @@ </address> </hostdev> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'> - <zpci uid='0x0002' fid='0x00000001'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml index 094d6f1ce4..09ee053c92 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml @@ -40,9 +40,7 @@ </address> </hostdev> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'> - <zpci uid='0x0002' fid='0x00000001'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml index 759589242d..72bcf30b43 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml @@ -89,9 +89,7 @@ </address> </hostdev> <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'> - <zpci uid='0x0005' fid='0x00000004'/> - </address> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </memballoon> <panic model='s390'/> </devices> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index d3876d2f03..3a2d029c4f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -242,7 +242,7 @@ mymain(void) DO_TEST_NOCAPS("machine-core-off"); DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); - DO_TEST("machine-loadparm-multiple-disks-nets-s390", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); DO_TEST_NOCAPS("boot-cdrom"); @@ -358,8 +358,7 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW); + QEMU_CAPS_DEVICE_ZPCI); DO_TEST_NOCAPS("disk-mirror-old"); DO_TEST_NOCAPS("disk-mirror"); DO_TEST_NOCAPS("disk-active-commit"); @@ -532,8 +531,7 @@ mymain(void) DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio-zpci", QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI, - QEMU_CAPS_CCW); + QEMU_CAPS_DEVICE_ZPCI); DO_TEST("hostdev-vfio-zpci-multidomain-many", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -552,7 +550,6 @@ mymain(void) QEMU_CAPS_DEVICE_PCI_BRIDGE, 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("hostdev-mdev-precreated", QEMU_CAPS_DEVICE_VFIO_PCI); @@ -597,11 +594,11 @@ mymain(void) DO_TEST_NOCAPS("iothreads-ids-partial"); DO_TEST_NOCAPS("cputune-iothreads"); DO_TEST_NOCAPS("iothreads-disk"); - DO_TEST("iothreads-disk-virtio-ccw", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("iothreads-disk-virtio-ccw"); DO_TEST("iothreads-virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI); DO_TEST("iothreads-virtio-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI); DO_TEST_NOCAPS("lease"); DO_TEST_NOCAPS("event_idx"); DO_TEST_NOCAPS("vhost_queues"); @@ -867,8 +864,7 @@ mymain(void) QEMU_CAPS_HDA_DUPLEX); DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI, - QEMU_CAPS_CCW); + QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -892,21 +888,19 @@ mymain(void) QEMU_CAPS_SCSI_LSI); DO_TEST("hostdev-subsys-mdev-vfio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); DO_TEST("hostdev-subsys-mdev-vfio-ap", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VFIO_AP); DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - DO_TEST("s390-panic", QEMU_CAPS_CCW); - DO_TEST("s390-panic-missing", QEMU_CAPS_CCW); - DO_TEST("s390-panic-no-address", QEMU_CAPS_CCW); - DO_TEST("s390-serial", QEMU_CAPS_CCW); - DO_TEST("s390-serial-2", QEMU_CAPS_CCW); - DO_TEST("s390-serial-console", QEMU_CAPS_CCW); + DO_TEST_NOCAPS("s390-panic"); + DO_TEST_NOCAPS("s390-panic-missing"); + DO_TEST_NOCAPS("s390-panic-no-address"); + DO_TEST_NOCAPS("s390-serial"); + DO_TEST_NOCAPS("s390-serial-2"); + DO_TEST_NOCAPS("s390-serial-console"); DO_TEST_NOCAPS("pcihole64"); DO_TEST_NOCAPS("pcihole64-gib"); @@ -1122,12 +1116,10 @@ mymain(void) DO_TEST("video-qxl-resolution", QEMU_CAPS_DEVICE_QXL); DO_TEST("video-virtio-gpu-secondary", QEMU_CAPS_DEVICE_VIRTIO_GPU); DO_TEST("video-virtio-gpu-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); DO_TEST("video-virtio-gpu-ccw-auto", - QEMU_CAPS_CCW, QEMU_CAPS_DEVICE_VIRTIO_GPU, QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); @@ -1170,7 +1162,6 @@ mymain(void) DO_TEST_CAPS_LATEST("user-aliases"); DO_TEST("input-virtio-ccw", - QEMU_CAPS_CCW, QEMU_CAPS_VIRTIO_KEYBOARD, QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, @@ -1182,10 +1173,8 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); - DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_CCW); - DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_CCW); + DO_TEST("vhost-vsock-ccw", QEMU_CAPS_DEVICE_VHOST_VSOCK); + DO_TEST("vhost-vsock-ccw-auto", QEMU_CAPS_DEVICE_VHOST_VSOCK); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); -- 2.37.3

Now that we no longer use the capability, stop probing for existence of 'virtual-css-bridge' and its properties. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 9 +-- src/qemu/qemu_capabilities.h | 2 +- .../caps_4.2.0.s390x.replies | 71 ++++++----------- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - .../caps_5.2.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - .../caps_6.0.0.s390x.replies | 76 +++++++------------ .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - 8 files changed, 78 insertions(+), 159 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 699111a431..50bde370e8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -479,7 +479,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "memory-backend-file.discard-data", /* QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD */ /* 295 */ - "virtual-css-bridge", /* QEMU_CAPS_CCW */ + "virtual-css-bridge", /* X_QEMU_CAPS_CCW */ "virtual-css-bridge.cssid-unrestricted", /* X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED */ "vfio-ccw", /* QEMU_CAPS_DEVICE_VFIO_CCW */ "sdl-gl", /* X_QEMU_CAPS_SDL_GL */ @@ -1328,7 +1328,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW }, { "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE }, { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, - { "virtual-css-bridge", QEMU_CAPS_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, { "hda-output", QEMU_CAPS_HDA_OUTPUT }, { "vmgenid", QEMU_CAPS_DEVICE_VMGENID }, @@ -1531,9 +1530,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU[] = { { "aw-bits", QEMU_CAPS_INTEL_IOMMU_AW_BITS, NULL }, }; -static struct virQEMUCapsDevicePropsFlags virQEMUCapsObjectPropsVirtualCSSBridge[] = { -}; - static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsMCH[] = { { "extended-tseg-mbytes", QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES, NULL }, }; @@ -1680,9 +1676,6 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = { { "virtio-gpu-ccw", virQEMUCapsDevicePropsVirtioGpu, G_N_ELEMENTS(virQEMUCapsDevicePropsVirtioGpu), QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW }, - { "virtual-css-bridge", virQEMUCapsObjectPropsVirtualCSSBridge, - G_N_ELEMENTS(virQEMUCapsObjectPropsVirtualCSSBridge), - QEMU_CAPS_CCW }, { "mch", virQEMUCapsDevicePropsMCH, G_N_ELEMENTS(virQEMUCapsDevicePropsMCH), QEMU_CAPS_DEVICE_MCH }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 263ef850c7..ca919ff368 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -458,7 +458,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */ /* 295 */ - QEMU_CAPS_CCW, /* -device virtual-css-bridge */ + X_QEMU_CAPS_CCW, /* -device virtual-css-bridge */ X_QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */ QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */ X_QEMU_CAPS_SDL_GL, /* -sdl gl */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies index b7e6abb749..8c7bbb85ec 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies @@ -16875,35 +16875,12 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - }, - { - "name": "css_dev_path", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -16992,7 +16969,7 @@ "type": "bool" } ], - "id": "libvirt-28" + "id": "libvirt-27" } { @@ -17000,7 +16977,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17071,7 +17048,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -17079,7 +17056,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17144,7 +17121,7 @@ "type": "bool" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -17152,7 +17129,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -17216,12 +17193,12 @@ "type": "int" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { "execute": "query-machines", - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17348,7 +17325,7 @@ "deprecated": false } ], - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -17356,7 +17333,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -17461,12 +17438,12 @@ "type": "bool" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { "execute": "query-cpu-definitions", - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -18073,34 +18050,34 @@ "migration-safe": true } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-tpm-models", - "id": "libvirt-35" + "id": "libvirt-34" } { "return": [ ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-types", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-command-line-options", - "id": "libvirt-37" + "id": "libvirt-36" } { @@ -19247,12 +19224,12 @@ "option": "drive" } ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-migrate-capabilities", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -19330,7 +19307,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -19341,7 +19318,7 @@ "name": "host" } }, - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -19395,7 +19372,7 @@ } } }, - "id": "libvirt-39" + "id": "libvirt-38" } { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 4bb6d1fc5e..6cd7256b0d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -62,7 +62,6 @@ <flag name='pr-manager-helper'/> <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> - <flag name='virtual-css-bridge'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies index 720bf54649..f89a42680a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies @@ -19295,40 +19295,16 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -19340,7 +19316,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19416,7 +19392,7 @@ "type": "uint16" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -19424,7 +19400,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19435,7 +19411,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -19443,7 +19419,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19513,7 +19489,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -19521,7 +19497,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -19590,12 +19566,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19764,7 +19740,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -19772,7 +19748,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -19857,12 +19833,12 @@ "type": "string" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -20543,34 +20519,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -21726,12 +21702,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21809,7 +21785,7 @@ "capability": "validate-uuid" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -21820,7 +21796,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -21876,7 +21852,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 40eb1550af..40a4a8b19d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -60,7 +60,6 @@ <flag name='pr-manager-helper'/> <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> - <flag name='virtual-css-bridge'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies index cb225eab00..83e75ca0fa 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.replies @@ -20929,40 +20929,16 @@ "id": "libvirt-26" } -{ - "execute": "device-list-properties", - "arguments": { - "typename": "virtual-css-bridge" - }, - "id": "libvirt-27" -} - -{ - "return": [ - { - "default-value": true, - "name": "css_dev_path", - "type": "bool" - }, - { - "name": "cssid-unrestricted", - "description": "A css device can use any cssid, regardless whether virtual or not (read only, always true)", - "type": "bool" - } - ], - "id": "libvirt-27" -} - { "execute": "device-list-properties", "arguments": { "typename": "usb-host" }, - "id": "libvirt-28" + "id": "libvirt-27" } { - "id": "libvirt-28", + "id": "libvirt-27", "error": { "class": "DeviceNotFound", "desc": "Device 'usb-host' not found" @@ -20974,7 +20950,7 @@ "arguments": { "typename": "vhost-user-fs-device" }, - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21054,7 +21030,7 @@ "type": "int32" } ], - "id": "libvirt-29" + "id": "libvirt-28" } { @@ -21062,7 +21038,7 @@ "arguments": { "typename": "virtio-iommu-pci" }, - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21073,7 +21049,7 @@ "type": "str" } ], - "id": "libvirt-30" + "id": "libvirt-29" } { @@ -21081,7 +21057,7 @@ "arguments": { "typename": "memory-backend-file" }, - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21151,7 +21127,7 @@ "type": "bool" } ], - "id": "libvirt-31" + "id": "libvirt-30" } { @@ -21159,7 +21135,7 @@ "arguments": { "typename": "memory-backend-memfd" }, - "id": "libvirt-32" + "id": "libvirt-31" } { @@ -21228,12 +21204,12 @@ "type": "int" } ], - "id": "libvirt-32" + "id": "libvirt-31" } { "execute": "query-machines", - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21411,7 +21387,7 @@ "default-ram-id": "s390.ram" } ], - "id": "libvirt-33" + "id": "libvirt-32" } { @@ -21419,7 +21395,7 @@ "arguments": { "typename": "none-machine" }, - "id": "libvirt-34" + "id": "libvirt-33" } { @@ -21517,12 +21493,12 @@ "type": "child<container>" } ], - "id": "libvirt-34" + "id": "libvirt-33" } { "execute": "query-cpu-definitions", - "id": "libvirt-35" + "id": "libvirt-34" } { @@ -22203,34 +22179,34 @@ "deprecated": false } ], - "id": "libvirt-35" + "id": "libvirt-34" } { "execute": "query-tpm-models", - "id": "libvirt-36" + "id": "libvirt-35" } { "return": [ ], - "id": "libvirt-36" + "id": "libvirt-35" } { "execute": "query-tpm-types", - "id": "libvirt-37" + "id": "libvirt-36" } { "return": [ ], - "id": "libvirt-37" + "id": "libvirt-36" } { "execute": "query-command-line-options", - "id": "libvirt-38" + "id": "libvirt-37" } { @@ -23406,12 +23382,12 @@ "option": "drive" } ], - "id": "libvirt-38" + "id": "libvirt-37" } { "execute": "query-migrate-capabilities", - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23493,7 +23469,7 @@ "capability": "background-snapshot" } ], - "id": "libvirt-39" + "id": "libvirt-38" } { @@ -23504,7 +23480,7 @@ "name": "host" } }, - "id": "libvirt-40" + "id": "libvirt-39" } { @@ -23561,7 +23537,7 @@ } } }, - "id": "libvirt-40" + "id": "libvirt-39" } { diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 2628ab1409..3b6e8a0a47 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -60,7 +60,6 @@ <flag name='pr-manager-helper'/> <flag name='qom-list-properties'/> <flag name='memory-backend-file.discard-data'/> - <flag name='virtual-css-bridge'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> -- 2.37.3