[PATCH 0/7] qemu capability testing cleanups and improvements (part 4)

This series applies on top of 'part3' fetch everything from my repo: git fetch https://gitlab.com/pipo.sk/libvirt.git s390-send In this part tests for the 's390' platform are converted to use real capabilities. Peter Krempa (7): qemuxml2argvtest: Remove obsolete negative tests qemuxml2argvtest: Modernize all s390 'keywrap' tests qemuxml2argvtest: Modernize all s390 'loadparm' tests qemuxml2argvtest: Modernize s390 cpu tests qemuxml2argvtest: Convert rest of s390 tests to real caps qemuxml2xmltest: Convert all s390 test cases to real capabilities testutilsqemu: Drop fake capability testing infrastructure for 's390' tests/qemuxml2argvdata/cpu-s390-features.err | 1 - ...gs => cpu-s390-features.s390x-latest.args} | 6 +- ....args => cpu-s390-zEC12.s390x-latest.args} | 6 +- ...dev-scsi-vhost-scsi-ccw.s390x-latest.args} | 7 +- ...io-ccw-duplicate-address.s390x-latest.err} | 0 ...vfio-ccw-invalid-address.s390x-latest.err} | 0 .../hostdev-subsys-mdev-vfio-ccw.err | 1 - .../hostdev-vfio-zpci-autogenerate-fids.err | 1 - ...ev-vfio-zpci-boundaries.s390x-latest.args} | 7 +- ...tdev-vfio-zpci-duplicate.s390x-latest.err} | 0 ...stdev-vfio-zpci-set-zero.s390x-latest.err} | 0 ...v-vfio-zpci-uid-set-zero.s390x-latest.err} | 0 tests/qemuxml2argvdata/hostdev-vfio-zpci.err | 1 - ...gs => hostdev-vfio-zpci.s390x-latest.args} | 7 +- ...rgs => input-virtio-ccw.s390x-latest.args} | 7 +- ...hine-aeskeywrap-off-cap.s390x-latest.args} | 7 +- ...ine-aeskeywrap-off-caps.s390x-latest.args} | 7 +- ...chine-aeskeywrap-on-cap.s390x-latest.args} | 7 +- ...hine-aeskeywrap-on-caps.s390x-latest.args} | 7 +- ...hine-deakeywrap-off-cap.s390x-latest.args} | 7 +- ...ine-deakeywrap-off-caps.s390x-latest.args} | 7 +- ...chine-deakeywrap-on-cap.s390x-latest.args} | 7 +- ...hine-deakeywrap-on-caps.s390x-latest.args} | 7 +- .../machine-keywrap-none-caps.args | 31 ----- ...achine-keywrap-none-caps.s390x-latest.args | 34 +++++ .../machine-keywrap-none.args | 31 ----- .../machine-keywrap-none.s390x-latest.args | 34 +++++ ...ultiple-disks-nets-s390.s390x-latest.args} | 7 +- ...chine-loadparm-net-s390.s390x-latest.args} | 7 +- ...> machine-loadparm-s390.s390x-latest.args} | 7 +- ....err => s390-no-parallel.s390x-latest.err} | 0 ...rr => s390-panic-address.s390x-latest.err} | 0 ...s => s390-panic-missing.s390x-latest.args} | 7 +- ...> s390-panic-no-address.s390x-latest.args} | 7 +- ...2.args => s390-serial-2.s390x-latest.args} | 7 +- ... => s390-serial-console.s390x-latest.args} | 7 +- ...ial.args => s390-serial.s390x-latest.args} | 7 +- ...=> video-virtio-gpu-ccw.s390x-latest.args} | 7 +- tests/qemuxml2argvtest.c | 130 +++++------------- ...=> disk-virtio-s390-zpci.s390x-latest.xml} | 3 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} | 4 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} | 4 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} | 4 + ...o-zpci-autogenerate-fids.s390x-latest.xml} | 3 + ...o-zpci-autogenerate-uids.s390x-latest.xml} | 3 + ...v-vfio-zpci-autogenerate.s390x-latest.xml} | 3 + ...dev-vfio-zpci-boundaries.s390x-latest.xml} | 3 + ...vfio-zpci-ccw-memballoon.s390x-latest.xml} | 1 + ...io-zpci-multidomain-many.s390x-latest.xml} | 3 + ...xml => hostdev-vfio-zpci.s390x-latest.xml} | 3 + ....xml => input-virtio-ccw.s390x-latest.xml} | 4 + ...multiple-disks-nets-s390.s390x-latest.xml} | 4 + ...ml => s390-panic-missing.s390x-latest.xml} | 4 + ...=> s390-panic-no-address.s390x-latest.xml} | 4 + ...-panic.xml => s390-panic.s390x-latest.xml} | 2 + ...l-2.xml => s390-serial-2.s390x-latest.xml} | 4 + ...l => s390-serial-console.s390x-latest.xml} | 4 + ...nsole.xml => s390-serial.s390x-latest.xml} | 4 + ... => vhost-vsock-ccw-auto.s390x-latest.xml} | 4 + .../vhost-vsock-ccw.s390x-latest.xml | 37 +++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... => video-virtio-gpu-ccw.s390x-latest.xml} | 4 + tests/qemuxml2xmltest.c | 81 ++++------- tests/testutilsqemu.c | 6 - 65 files changed, 355 insertions(+), 269 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err rename tests/qemuxml2argvdata/{cpu-s390-features.args => cpu-s390-features.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} (67%) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-duplicate-address.err => hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-invalid-address.err => hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-boundaries.args => hostdev-vfio-zpci-boundaries.s390x-latest.args} (75%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-duplicate.err => hostdev-vfio-zpci-duplicate.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-set-zero.err => hostdev-vfio-zpci-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-uid-set-zero.err => hostdev-vfio-zpci-uid-set-zero.s390x-latest.err} (100%) delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.err rename tests/qemuxml2argvdata/{hostdev-vfio-zpci.args => hostdev-vfio-zpci.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{input-virtio-ccw.args => input-virtio-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-caps.args => machine-aeskeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-cap.args => machine-aeskeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-caps.args => machine-deakeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.s390x-latest.args} (77%) delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args rename tests/qemuxml2argvdata/{machine-loadparm-multiple-disks-nets-s390.args => machine-loadparm-multiple-disks-nets-s390.s390x-latest.args} (81%) rename tests/qemuxml2argvdata/{machine-loadparm-net-s390.args => machine-loadparm-net-s390.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{machine-loadparm-s390.args => machine-loadparm-s390.s390x-latest.args} (74%) rename tests/qemuxml2argvdata/{s390-no-parallel.err => s390-no-parallel.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-address.err => s390-panic-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-missing.args => s390-panic-missing.s390x-latest.args} (72%) rename tests/qemuxml2argvdata/{s390-panic-no-address.args => s390-panic-no-address.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-2.args => s390-serial-2.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-console.args => s390-serial-console.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{s390-serial.args => s390-serial.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{video-virtio-gpu-ccw.args => video-virtio-gpu-ccw.s390x-latest.args} (77%) rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml => disk-virtio-s390-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml => hostdev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml => hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml => hostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml => hostdev-vfio-zpci-boundaries.s390x-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml => hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml => hostdev-vfio-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml => input-virtio-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml => s390-panic-missing.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml => s390-panic-no-address.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{s390-panic.xml => s390-panic.s390x-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{s390-serial-2.xml => s390-serial-2.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-serial.xml => s390-serial-console.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{s390-serial-console.xml => s390-serial.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml => vhost-vsock-ccw-auto.s390x-latest.xml} (87%) create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%) -- 2.39.2

The 'hostdev-subsys-mdev-vfio-ccw', 'hostdev-vfio-zpci', and 'hostdev-vfio-zpci-autogenerate-fids' test cases have negative versions which are invoked without capabilities. This does not make sense going forward as the tests are going to be switched to real capabilities. Remove them. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err | 1 - .../qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err | 1 - tests/qemuxml2argvdata/hostdev-vfio-zpci.err | 1 - tests/qemuxml2argvtest.c | 5 ----- 4 files changed, 8 deletions(-) delete mode 100644 tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err delete mode 100644 tests/qemuxml2argvdata/hostdev-vfio-zpci.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err deleted file mode 100644 index 88c13f62b6..0000000000 --- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: VFIO CCW device assignment is not supported by this version of QEMU diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err deleted file mode 100644 index a0ca4fba5d..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.err +++ /dev/null @@ -1 +0,0 @@ -XML error: No PCI buses available diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci.err deleted file mode 100644 index 842693b4e0..0000000000 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: This QEMU binary doesn't support zPCI diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 4fada9725f..dbf8509f6d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1750,8 +1750,6 @@ mymain(void) DO_TEST("hostdev-vfio-zpci", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); @@ -1764,8 +1762,6 @@ mymain(void) QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", QEMU_CAPS_DEVICE_VFIO_PCI, QEMU_CAPS_DEVICE_ZPCI); @@ -1781,7 +1777,6 @@ 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_NOCAPS("hostdev-subsys-mdev-vfio-ccw"); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", QEMU_CAPS_DEVICE_VFIO_CCW); DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", -- 2.39.2

Use latest caps for the tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...hine-aeskeywrap-off-cap.s390x-latest.args} | 7 +++- ...ine-aeskeywrap-off-caps.s390x-latest.args} | 7 +++- ...chine-aeskeywrap-on-cap.s390x-latest.args} | 7 +++- ...hine-aeskeywrap-on-caps.s390x-latest.args} | 7 +++- ...hine-deakeywrap-off-cap.s390x-latest.args} | 7 +++- ...ine-deakeywrap-off-caps.s390x-latest.args} | 7 +++- ...chine-deakeywrap-on-cap.s390x-latest.args} | 7 +++- ...hine-deakeywrap-on-caps.s390x-latest.args} | 7 +++- .../machine-keywrap-none-caps.args | 31 --------------- ...achine-keywrap-none-caps.s390x-latest.args | 34 +++++++++++++++++ .../machine-keywrap-none.args | 31 --------------- .../machine-keywrap-none.s390x-latest.args | 34 +++++++++++++++++ tests/qemuxml2argvtest.c | 38 +++++-------------- 13 files changed, 118 insertions(+), 106 deletions(-) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-cap.args => machine-aeskeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-off-caps.args => machine-aeskeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-cap.args => machine-aeskeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-aeskeywrap-on-caps.args => machine-aeskeywrap-on-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-cap.args => machine-deakeywrap-off-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-off-caps.args => machine-deakeywrap-off-caps.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-cap.args => machine-deakeywrap-on-cap.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{machine-deakeywrap-on-caps.args => machine-deakeywrap-on-caps.s390x-latest.args} (77%) delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args delete mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.args create mode 100644 tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args index 95602afc03..9fb612a69d 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,aes-key-wrap=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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args index 95602afc03..9fb612a69d 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,aes-key-wrap=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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args index 98d10f07e1..9d75fc8a57 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args rename to tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args index 98d10f07e1..9d75fc8a57 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args rename to tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args index 75328814b5..fe8a1a2545 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dea-key-wrap=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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args rename to tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args index 75328814b5..fe8a1a2545 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dea-key-wrap=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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args rename to tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args index edb16b7716..b40a7fd10d 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args rename to tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args index edb16b7716..b40a7fd10d 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args deleted file mode 100644 index 0371cc1e24..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-s390x \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args new file mode 100644 index 0000000000..c23e11cb28 --- /dev/null +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.s390x-latest.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/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 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args deleted file mode 100644 index 0371cc1e24..0000000000 --- a/tests/qemuxml2argvdata/machine-keywrap-none.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -/usr/bin/qemu-system-s390x \ --name guest=QEMUGuest1,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ --accel tcg \ --m 214 \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --boot strict=on \ --blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args new file mode 100644 index 0000000000..c23e11cb28 --- /dev/null +++ b/tests/qemuxml2argvdata/machine-keywrap-none.s390x-latest.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/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 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dbf8509f6d..b1bda4e4d7 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2545,34 +2545,16 @@ mymain(void) DO_TEST_CAPS_LATEST("memory-hotplug-virtio-pmem"); DO_TEST_CAPS_LATEST("memory-hotplug-virtio-mem"); - DO_TEST("machine-aeskeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-aeskeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-on-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-on-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-off-caps", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-deakeywrap-off-cap", - QEMU_CAPS_VIRTIO_SCSI); - - DO_TEST("machine-keywrap-none-caps", - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("machine-keywrap-none", - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-on-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-off-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-aeskeywrap-off-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-on-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-on-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-off-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-deakeywrap-off-cap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none-caps", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none", "s390x"); DO_TEST_NOCAPS("machine-loadparm-s390"); DO_TEST_NOCAPS("machine-loadparm-net-s390"); -- 2.39.2

Use latest caps for the tests. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...ne-loadparm-multiple-disks-nets-s390.s390x-latest.args} | 7 +++++-- ...90.args => machine-loadparm-net-s390.s390x-latest.args} | 7 +++++-- ...m-s390.args => machine-loadparm-s390.s390x-latest.args} | 7 +++++-- tests/qemuxml2argvtest.c | 6 +++--- 4 files changed, 18 insertions(+), 9 deletions(-) rename tests/qemuxml2argvdata/{machine-loadparm-multiple-disks-nets-s390.args => machine-loadparm-multiple-disks-nets-s390.s390x-latest.args} (81%) rename tests/qemuxml2argvdata/{machine-loadparm-net-s390.args => machine-loadparm-net-s390.s390x-latest.args} (70%) rename tests/qemuxml2argvdata/{machine-loadparm-s390.args => machine-loadparm-s390.s390x-latest.args} (74%) diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args similarity index 81% rename from tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args rename to tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args index f1830a47b1..04c79bdb69 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=SYSTEM1 \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,loadparm=SYSTEM1 \ -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 \ @@ -36,4 +38,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:42:36,devno=fe.0.0004 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args similarity index 70% rename from tests/qemuxml2argvdata/machine-loadparm-net-s390.args rename to tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args index 8df9e06be9..aeff83148f 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,loadparm=2 \ -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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=1,devno=fe.0.0000 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args similarity index 74% rename from tests/qemuxml2argvdata/machine-loadparm-s390.args rename to tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args index 52b11be4ea..acd7ab845a 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,loadparm=2 \ -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 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtio-blk-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b1bda4e4d7..9fcd0314b6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2556,10 +2556,10 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none-caps", "s390x"); DO_TEST_CAPS_ARCH_LATEST("machine-keywrap-none", "s390x"); - DO_TEST_NOCAPS("machine-loadparm-s390"); - DO_TEST_NOCAPS("machine-loadparm-net-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-s390", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-net-s390", "s390x"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); - DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-char-invalid"); DO_TEST_PARSE_ERROR_NOCAPS("machine-loadparm-s390-len-invalid"); -- 2.39.2

Use real capabilities for the CPU test. The negative test case for QEMUs without QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION is removed as the feature is now supported by all supported qemu versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/qemuxml2argvdata/cpu-s390-features.err | 1 - ...0-features.args => cpu-s390-features.s390x-latest.args} | 6 ++++-- ...pu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} | 6 ++++-- tests/qemuxml2argvtest.c | 7 ++----- 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err rename tests/qemuxml2argvdata/{cpu-s390-features.args => cpu-s390-features.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} (67%) diff --git a/tests/qemuxml2argvdata/cpu-s390-features.err b/tests/qemuxml2argvdata/cpu-s390-features.err deleted file mode 100644 index 5f078fc8e1..0000000000 --- a/tests/qemuxml2argvdata/cpu-s390-features.err +++ /dev/null @@ -1 +0,0 @@ -internal error: CPU features not supported by hypervisor for s390x architecture diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args similarity index 68% rename from tests/qemuxml2argvdata/cpu-s390-features.args rename to tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args index 69e705e895..d6c1d6e278 100644 --- a/tests/qemuxml2argvdata/cpu-s390-features.args +++ b/tests/qemuxml2argvdata/cpu-s390-features.s390x-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=guest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ -cpu zEC12,dfppc=on,stckf=off \ -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 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \ -no-shutdown \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args similarity index 67% rename from tests/qemuxml2argvdata/cpu-s390-zEC12.args rename to tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args index 1a33d6bcca..8ad4fd90ce 100644 --- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args +++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.s390x-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=guest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-guest1/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest1/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ -accel kvm \ -cpu zEC12 \ -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 +27,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest1/.config \ -no-shutdown \ -boot strict=on \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 9fcd0314b6..68772d12ab 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1871,11 +1871,8 @@ mymain(void) DO_TEST("cpu-host-passthrough", QEMU_CAPS_KVM); DO_TEST_FAILURE("cpu-qemu-host-passthrough", QEMU_CAPS_KVM); - qemuTestSetHostArch(&driver, VIR_ARCH_S390X); - 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); + DO_TEST_CAPS_ARCH_LATEST("cpu-s390-zEC12", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("cpu-s390-features", "s390x"); qemuTestSetHostCPU(&driver, driver.hostarch, qemuTestGetCPUDef(QEMU_CPU_DEF_HASWELL)); DO_TEST("cpu-Haswell", QEMU_CAPS_KVM); -- 2.39.2

Convert the rest of the outstanding tests to use real capabilities. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...dev-scsi-vhost-scsi-ccw.s390x-latest.args} | 7 +- ...io-ccw-duplicate-address.s390x-latest.err} | 0 ...vfio-ccw-invalid-address.s390x-latest.err} | 0 ...ev-vfio-zpci-boundaries.s390x-latest.args} | 7 +- ...tdev-vfio-zpci-duplicate.s390x-latest.err} | 0 ...stdev-vfio-zpci-set-zero.s390x-latest.err} | 0 ...v-vfio-zpci-uid-set-zero.s390x-latest.err} | 0 ...gs => hostdev-vfio-zpci.s390x-latest.args} | 7 +- ...rgs => input-virtio-ccw.s390x-latest.args} | 7 +- ....err => s390-no-parallel.s390x-latest.err} | 0 ...rr => s390-panic-address.s390x-latest.err} | 0 ...s => s390-panic-missing.s390x-latest.args} | 7 +- ...> s390-panic-no-address.s390x-latest.args} | 7 +- ...2.args => s390-serial-2.s390x-latest.args} | 7 +- ... => s390-serial-console.s390x-latest.args} | 7 +- ...ial.args => s390-serial.s390x-latest.args} | 7 +- ...=> video-virtio-gpu-ccw.s390x-latest.args} | 7 +- tests/qemuxml2argvtest.c | 72 ++++++------------- 18 files changed, 71 insertions(+), 71 deletions(-) rename tests/qemuxml2argvdata/{hostdev-scsi-vhost-scsi-ccw.args => hostdev-scsi-vhost-scsi-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-duplicate-address.err => hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-subsys-mdev-vfio-ccw-invalid-address.err => hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-boundaries.args => hostdev-vfio-zpci-boundaries.s390x-latest.args} (75%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-duplicate.err => hostdev-vfio-zpci-duplicate.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-set-zero.err => hostdev-vfio-zpci-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci-uid-set-zero.err => hostdev-vfio-zpci-uid-set-zero.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{hostdev-vfio-zpci.args => hostdev-vfio-zpci.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{input-virtio-ccw.args => input-virtio-ccw.s390x-latest.args} (77%) rename tests/qemuxml2argvdata/{s390-no-parallel.err => s390-no-parallel.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-address.err => s390-panic-address.s390x-latest.err} (100%) rename tests/qemuxml2argvdata/{s390-panic-missing.args => s390-panic-missing.s390x-latest.args} (72%) rename tests/qemuxml2argvdata/{s390-panic-no-address.args => s390-panic-no-address.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-2.args => s390-serial-2.s390x-latest.args} (71%) rename tests/qemuxml2argvdata/{s390-serial-console.args => s390-serial-console.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{s390-serial.args => s390-serial.s390x-latest.args} (69%) rename tests/qemuxml2argvdata/{video-virtio-gpu-ccw.args => video-virtio-gpu-ccw.s390x-latest.args} (77%) diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args rename to tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args index b17965990d..83b71ed272 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest2,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/master-key.aes \ --machine s390-ccw-virtio,usb=off,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest2/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-9466-926a-d65c16db1809 \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vhost-scsi-ccw,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,devno=fe.0.0002 \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0003 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.err rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-duplicate-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.err b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.err rename to tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-invalid-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args similarity index 75% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args index 3b7ef3e211..c4af2edd9e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 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/hostdev-vfio-zpci-duplicate.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-duplicate.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-set-zero.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.err b/tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.err rename to tests/qemuxml2argvdata/hostdev-vfio-zpci-uid-set-zero.s390x-latest.err diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/hostdev-vfio-zpci.args rename to tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args index e7ece11286..4ba14c181e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 \ @@ -28,4 +30,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -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 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/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/input-virtio-ccw.args rename to tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args index 0b8596fbd0..013d2128ee 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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-d65c16db1803 \ @@ -32,4 +34,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtio-tablet-ccw,id=input2,devno=fe.0.0004 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/s390-no-parallel.err b/tests/qemuxml2argvdata/s390-no-parallel.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-no-parallel.err rename to tests/qemuxml2argvdata/s390-no-parallel.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-panic-address.err b/tests/qemuxml2argvdata/s390-panic-address.s390x-latest.err similarity index 100% rename from tests/qemuxml2argvdata/s390-panic-address.err rename to tests/qemuxml2argvdata/s390-panic-address.s390x-latest.err diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args similarity index 72% rename from tests/qemuxml2argvdata/s390-panic-missing.args rename to tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args index 594f31b8c8..7ea849c458 100644 --- a/tests/qemuxml2argvdata/s390-panic-missing.args +++ b/tests/qemuxml2argvdata/s390-panic-missing.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 256 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtconsole,devno=fe.0.0001,chardev=charconsole0,id=console0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/s390-panic-no-address.args rename to tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args index adbab9bf3a..11ab53aaa1 100644 --- a/tests/qemuxml2argvdata/s390-panic-no-address.args +++ b/tests/qemuxml2argvdata/s390-panic-no-address.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 256 \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtconsole,chardev=charconsole0,id=console0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -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/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args similarity index 71% rename from tests/qemuxml2argvdata/s390-serial-2.args rename to tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args index 54856748a2..45ee168022 100644 --- a/tests/qemuxml2argvdata/s390-serial-2.args +++ b/tests/qemuxml2argvdata/s390-serial-2.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 \ @@ -29,4 +31,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev pty,id=charserial1 \ -device sclplmconsole,chardev=charserial1,id=serial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args similarity index 69% rename from tests/qemuxml2argvdata/s390-serial-console.args rename to tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args index 37b2de24fc..6ddeea60d9 100644 --- a/tests/qemuxml2argvdata/s390-serial-console.args +++ b/tests/qemuxml2argvdata/s390-serial-console.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev pty,id=charserial0 \ -device sclpconsole,chardev=charserial0,id=serial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.s390x-latest.args similarity index 69% rename from tests/qemuxml2argvdata/s390-serial.args rename to tests/qemuxml2argvdata/s390-serial.s390x-latest.args index 37b2de24fc..6ddeea60d9 100644 --- a/tests/qemuxml2argvdata/s390-serial.args +++ b/tests/qemuxml2argvdata/s390-serial.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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 \ @@ -27,4 +29,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -chardev pty,id=charserial0 \ -device sclpconsole,chardev=charserial0,id=serial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args similarity index 77% rename from tests/qemuxml2argvdata/video-virtio-gpu-ccw.args rename to tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args index 87c7dc9d3a..646d28fade 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.s390x-latest.args @@ -9,10 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ /usr/bin/qemu-system-s390x \ -name guest=QEMUGuest1,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/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":"/var/lib/libvirt/qemu/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-d65c16db1803 \ @@ -31,4 +33,5 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -device virtio-gpu-ccw,id=video0,max_outputs=1,devno=fe.0.0002 \ -device virtio-gpu-ccw,id=video1,max_outputs=1,devno=fe.0.0003 \ -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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 68772d12ab..2e72ebf8e3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1747,27 +1747,16 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("hostdev-mdev-display-ramfb-multiple"); DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-wrong-arch", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-invalid-uid-valid-fid", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-uids", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids", "s390x"); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-uid-set-zero", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-boundaries", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-uid-set-zero", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-boundaries", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-duplicate", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-vfio-zpci-set-zero", "s390x"); DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); DO_TEST("pci-rom", QEMU_CAPS_DEVICE_VFIO_PCI); @@ -1775,17 +1764,12 @@ mymain(void) DO_TEST_NOCAPS("pci-rom-disabled-invalid"); 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-duplicate-address", - QEMU_CAPS_DEVICE_VFIO_CCW); - DO_TEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", - QEMU_CAPS_DEVICE_VFIO_CCW); - - DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", - "s390x"); - DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot-fail", - "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ccw-boot", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-duplicate-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ccw-invalid-address", "s390x"); + + DO_TEST_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("hostdev-subsys-mdev-vfio-ap-boot-fail", "s390x"); DO_TEST_FULL("restore-v2", "", ARG_MIGRATE_FROM, "exec:cat", @@ -2121,16 +2105,13 @@ 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_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_DEVICE_SCLPCONSOLE, - QEMU_CAPS_DEVICE_SCLPLMCONSOLE); - DO_TEST("s390-serial-console", - QEMU_CAPS_DEVICE_SCLPCONSOLE); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-missing", "s390x"); + DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-no-parallel", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x"); DO_TEST_CAPS_ARCH_LATEST("ppc-dtb", "ppc"); DO_TEST_CAPS_ARCH_LATEST("ppce500-serial", "ppc"); @@ -2331,8 +2312,7 @@ mymain(void) DO_TEST_CAPS_LATEST("hostdev-scsi-lsi"); DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi"); - DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x"); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -2692,18 +2672,8 @@ 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_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); - - DO_TEST("input-virtio-ccw", - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, - QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, - QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("input-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); -- 2.39.2

Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- ...=> disk-virtio-s390-zpci.s390x-latest.xml} | 3 + ...tdev-scsi-vhost-scsi-ccw.s390x-latest.xml} | 4 + ...tdev-subsys-mdev-vfio-ap.s390x-latest.xml} | 4 + ...dev-subsys-mdev-vfio-ccw.s390x-latest.xml} | 4 + ...o-zpci-autogenerate-fids.s390x-latest.xml} | 3 + ...o-zpci-autogenerate-uids.s390x-latest.xml} | 3 + ...v-vfio-zpci-autogenerate.s390x-latest.xml} | 3 + ...dev-vfio-zpci-boundaries.s390x-latest.xml} | 3 + ...vfio-zpci-ccw-memballoon.s390x-latest.xml} | 1 + ...io-zpci-multidomain-many.s390x-latest.xml} | 3 + ...xml => hostdev-vfio-zpci.s390x-latest.xml} | 3 + ....xml => input-virtio-ccw.s390x-latest.xml} | 4 + ...multiple-disks-nets-s390.s390x-latest.xml} | 4 + ...ml => s390-panic-missing.s390x-latest.xml} | 4 + ...=> s390-panic-no-address.s390x-latest.xml} | 4 + ...-panic.xml => s390-panic.s390x-latest.xml} | 2 + ...l-2.xml => s390-serial-2.s390x-latest.xml} | 4 + ...l => s390-serial-console.s390x-latest.xml} | 4 + ...nsole.xml => s390-serial.s390x-latest.xml} | 4 + ... => vhost-vsock-ccw-auto.s390x-latest.xml} | 4 + .../vhost-vsock-ccw.s390x-latest.xml | 37 +++++++++ tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... => video-virtio-gpu-ccw.s390x-latest.xml} | 4 + tests/qemuxml2xmltest.c | 81 ++++++------------- 25 files changed, 137 insertions(+), 58 deletions(-) rename tests/qemuxml2xmloutdata/{disk-virtio-s390-zpci.xml => disk-virtio-s390-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-scsi-vhost-scsi-ccw.xml => hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ap.xml => hostdev-subsys-mdev-vfio-ap.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-subsys-mdev-vfio-ccw.xml => hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-fids.xml => hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate-uids.xml => hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml} (93%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-autogenerate.xml => hostdev-vfio-zpci-autogenerate.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-boundaries.xml => hostdev-vfio-zpci-boundaries.s390x-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-ccw-memballoon.xml => hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml} (96%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci-multidomain-many.xml => hostdev-vfio-zpci-multidomain-many.s390x-latest.xml} (97%) rename tests/qemuxml2xmloutdata/{hostdev-vfio-zpci.xml => hostdev-vfio-zpci.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{input-virtio-ccw.xml => input-virtio-ccw.s390x-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{machine-loadparm-multiple-disks-nets-s390.xml => machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml} (91%) rename tests/qemuxml2xmloutdata/{s390-panic-missing.xml => s390-panic-missing.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-panic-no-address.xml => s390-panic-no-address.s390x-latest.xml} (85%) rename tests/qemuxml2xmloutdata/{s390-panic.xml => s390-panic.s390x-latest.xml} (90%) rename tests/qemuxml2xmloutdata/{s390-serial-2.xml => s390-serial-2.s390x-latest.xml} (86%) rename tests/qemuxml2xmloutdata/{s390-serial.xml => s390-serial-console.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{s390-serial-console.xml => s390-serial.s390x-latest.xml} (84%) rename tests/qemuxml2xmloutdata/{vhost-vsock-ccw-auto.xml => vhost-vsock-ccw-auto.s390x-latest.xml} (87%) create mode 100644 tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%) diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml rename to tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml index bf1fe681be..c98bf78160 100644 --- a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml +++ b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml rename to tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml index 95eff7ead6..efd3027d3e 100644 --- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -23,6 +26,7 @@ <controller type='scsi' index='0' model='virtio-scsi'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='scsi_host' managed='no'> <source protocol='vhost' wwpn='naa.5123456789abcde0'/> diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml rename to tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml index d8a3043718..96cd88bfdd 100644 --- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml +++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <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> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ap'> <source> diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml rename to tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml index 37f8385717..b411a2a348 100644 --- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml +++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <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> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'> <source> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml index cc3687db95..dd1dea4e99 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml similarity index 93% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml index 5b03616d1e..1a52487692 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml index acee69fd86..670f8c68b4 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml index 09ee053c92..df55f79501 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml similarity index 96% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml index 276c9f3e69..7df6491b68 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.s390x-latest.xml @@ -8,6 +8,7 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml similarity index 97% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml index 72bcf30b43..e64d7de561 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml rename to tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml index 3b41c4e0c0..5e14a63810 100644 --- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml +++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml b/tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/input-virtio-ccw.xml rename to tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml index 3a4fcadda6..bca07c8fd8 100644 --- a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml +++ b/tests/qemuxml2xmloutdata/input-virtio-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <input type='keyboard' bus='virtio'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/> </input> diff --git a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml similarity index 91% rename from tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml rename to tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml index 3ea2c8c1c4..039968d7e4 100644 --- a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml +++ b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.s390x-latest.xml @@ -7,6 +7,9 @@ <os> <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -27,6 +30,7 @@ <boot order='3' loadparm='3'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <interface type='user'> <mac address='00:11:22:33:44:54'/> <model type='virtio'/> diff --git a/tests/qemuxml2xmloutdata/s390-panic-missing.xml b/tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/s390-panic-missing.xml rename to tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml index 1929826541..b36c12e435 100644 --- a/tests/qemuxml2xmloutdata/s390-panic-missing.xml +++ b/tests/qemuxml2xmloutdata/s390-panic-missing.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +20,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> diff --git a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml b/tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml similarity index 85% rename from tests/qemuxml2xmloutdata/s390-panic-no-address.xml rename to tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml index 1610eacdef..9b9fbf3243 100644 --- a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml +++ b/tests/qemuxml2xmloutdata/s390-panic-no-address.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +20,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> </console> diff --git a/tests/qemuxml2xmloutdata/s390-panic.xml b/tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml similarity index 90% rename from tests/qemuxml2xmloutdata/s390-panic.xml rename to tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml index 1c31685fb5..2f27890ceb 100644 --- a/tests/qemuxml2xmloutdata/s390-panic.xml +++ b/tests/qemuxml2xmloutdata/s390-panic.s390x-latest.xml @@ -8,6 +8,7 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='host-model' check='partial'/> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -17,6 +18,7 @@ <controller type='virtio-serial' index='0'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </controller> + <controller type='pci' index='0' model='pci-root'/> <console type='pty'> <target type='virtio' port='0'/> </console> diff --git a/tests/qemuxml2xmloutdata/s390-serial-2.xml b/tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml similarity index 86% rename from tests/qemuxml2xmloutdata/s390-serial-2.xml rename to tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml index 2ca82ecf03..bf67ed8c12 100644 --- a/tests/qemuxml2xmloutdata/s390-serial-2.xml +++ b/tests/qemuxml2xmloutdata/s390-serial-2.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <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> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/s390-serial.xml b/tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/s390-serial.xml rename to tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml index f29565f5c2..9ce55598bc 100644 --- a/tests/qemuxml2xmloutdata/s390-serial.xml +++ b/tests/qemuxml2xmloutdata/s390-serial-console.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <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> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/s390-serial-console.xml b/tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml similarity index 84% rename from tests/qemuxml2xmloutdata/s390-serial-console.xml rename to tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml index f29565f5c2..9ce55598bc 100644 --- a/tests/qemuxml2xmloutdata/s390-serial-console.xml +++ b/tests/qemuxml2xmloutdata/s390-serial.s390x-latest.xml @@ -8,12 +8,16 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <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> + <controller type='pci' index='0' model='pci-root'/> <serial type='pty'> <target type='sclp-serial' port='0'> <model name='sclpconsole'/> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml similarity index 87% rename from tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml rename to tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml index e2111dc738..c384522a42 100644 --- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml +++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <audio id='1' type='none'/> <memballoon model='virtio'> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml new file mode 100644 index 0000000000..d519028396 --- /dev/null +++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.s390x-latest.xml @@ -0,0 +1,37 @@ +<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='s390x' machine='s390-ccw-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> + <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'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='virtio'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </disk> + <controller type='pci' index='0' model='pci-root'/> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/> + </memballoon> + <panic model='s390'/> + <vsock model='virtio'> + <cid auto='no' address='4'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/> + </vsock> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml deleted file mode 120000 index e0fa69dba9..0000000000 --- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/vhost-vsock-ccw.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml similarity index 88% rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml rename to tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml index 47c70a9301..87ee9eee54 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <graphics type='vnc' port='-1' autoport='yes'> <listen type='address'/> </graphics> diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml similarity index 89% rename from tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml rename to tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml index ccc58a4a5d..9b6bf6c980 100644 --- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml +++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.s390x-latest.xml @@ -8,6 +8,9 @@ <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> <boot dev='hd'/> </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> @@ -20,6 +23,7 @@ <target dev='hda' bus='virtio'/> <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> </disk> + <controller type='pci' index='0' model='pci-root'/> <graphics type='vnc' port='-1' autoport='yes'> <listen type='address'/> </graphics> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 60ff48550f..a8a6cd6ca7 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -208,7 +208,7 @@ mymain(void) DO_TEST_CAPS_LATEST("machine-smm-on"); DO_TEST_CAPS_LATEST("machine-smm-off"); DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-hostdev", "s390x"); - DO_TEST_NOCAPS("machine-loadparm-multiple-disks-nets-s390"); + DO_TEST_CAPS_ARCH_LATEST("machine-loadparm-multiple-disks-nets-s390", "s390x"); DO_TEST_NOCAPS("default-kvm-host-arch"); DO_TEST_NOCAPS("default-qemu-host-arch"); DO_TEST_NOCAPS("boot-cdrom"); @@ -323,8 +323,7 @@ mymain(void) QEMU_CAPS_PR_MANAGER_HELPER, QEMU_CAPS_SCSI_BLOCK); DO_TEST("controller-virtio-scsi", QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("disk-virtio-s390-zpci", - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("disk-virtio-s390-zpci", "s390x"); DO_TEST_NOCAPS("disk-mirror-old"); DO_TEST_NOCAPS("disk-mirror"); DO_TEST_NOCAPS("disk-active-commit"); @@ -492,29 +491,13 @@ mymain(void) DO_TEST("hostdev-pci-address-unassigned", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST("hostdev-vfio-zpci", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-multidomain-many", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-uids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-autogenerate-fids", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-boundaries", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_ZPCI); - DO_TEST("hostdev-vfio-zpci-ccw-memballoon", - QEMU_CAPS_DEVICE_VFIO_PCI, - QEMU_CAPS_DEVICE_ZPCI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-multidomain-many", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-uids", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-autogenerate-fids", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-boundaries", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("hostdev-vfio-zpci-ccw-memballoon", "s390x"); DO_TEST("hostdev-mdev-precreated", QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("hostdev-mdev-display", QEMU_CAPS_DEVICE_QXL, @@ -814,8 +797,7 @@ mymain(void) QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_HDA_DUPLEX); - DO_TEST("hostdev-scsi-vhost-scsi-ccw", - QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); + DO_TEST_CAPS_ARCH_LATEST("hostdev-scsi-vhost-scsi-ccw", "s390x"); DO_TEST("hostdev-scsi-vhost-scsi-pci", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_VHOST_SCSI); @@ -838,20 +820,17 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI); - DO_TEST("hostdev-subsys-mdev-vfio-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_DEVICE_VFIO_AP); + 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_CAPS_ARCH_LATEST("hostdev-subsys-mdev-vfio-ap", "s390x"); DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x"); - 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_CAPS_ARCH_LATEST("s390-panic", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-missing", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-2", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("s390-serial-console", "s390x"); DO_TEST_NOCAPS("pcihole64"); DO_TEST_NOCAPS("pcihole64-gib"); @@ -1085,14 +1064,8 @@ mymain(void) DO_TEST("video-qxl-noheads", QEMU_CAPS_DEVICE_QXL); 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_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); - DO_TEST("video-virtio-gpu-ccw-auto", - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VNC, - QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x"); DO_TEST("video-none-device", QEMU_CAPS_VNC); DO_TEST_CAPS_LATEST("video-virtio-vga-gpu-gl"); DO_TEST_CAPS_LATEST("video-virtio-blob-on"); @@ -1133,20 +1106,14 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64"); DO_TEST_CAPS_LATEST("user-aliases"); - DO_TEST("input-virtio-ccw", - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, - QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, - QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); + DO_TEST_CAPS_ARCH_LATEST("input-virtio-ccw", "s390x"); DO_TEST_CAPS_LATEST("tseg-explicit-size"); DO_TEST_CAPS_LATEST("vhost-vsock"); DO_TEST_CAPS_LATEST("vhost-vsock-auto"); - 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", "s390x"); + DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-auto", "s390x"); DO_TEST_CAPS_ARCH_LATEST("vhost-vsock-ccw-iommu", "s390x"); -- 2.39.2

Now that all tests were converted to use real capabilities we don't need it any more. Remove it so that no new tests are added with it. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- tests/testutilsqemu.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index bd3de1e786..f3199755f6 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -30,7 +30,6 @@ static const char *qemu_emulators[VIR_ARCH_LAST] = { [VIR_ARCH_I686] = "/usr/bin/qemu-system-i386", [VIR_ARCH_X86_64] = "/usr/bin/qemu-system-x86_64", [VIR_ARCH_AARCH64] = "/usr/bin/qemu-system-aarch64", - [VIR_ARCH_S390X] = "/usr/bin/qemu-system-s390x", }; static const char *const i386_machines[] = { @@ -43,22 +42,17 @@ static const char *const x86_64_machines[] = { static const char *const aarch64_machines[] = { "virt", "virt-2.6", "versatilepb", NULL }; -static const char *const s390x_machines[] = { - "s390-ccw-virtio", NULL -}; static const char *const *qemu_machines[VIR_ARCH_LAST] = { [VIR_ARCH_I686] = i386_machines, [VIR_ARCH_X86_64] = x86_64_machines, [VIR_ARCH_AARCH64] = aarch64_machines, - [VIR_ARCH_S390X] = s390x_machines, }; static const char *qemu_default_ram_id[VIR_ARCH_LAST] = { [VIR_ARCH_I686] = "pc.ram", [VIR_ARCH_X86_64] = "pc.ram", [VIR_ARCH_AARCH64] = "mach-virt.ram", - [VIR_ARCH_S390X] = "s390.ram", }; char * -- 2.39.2

On a Friday in 2023, Peter Krempa wrote:
This series applies on top of 'part3' fetch everything from my repo:
git fetch https://gitlab.com/pipo.sk/libvirt.git s390-send
In this part tests for the 's390' platform are converted to use real capabilities.
Only three more platforms to go ;)
Peter Krempa (7): qemuxml2argvtest: Remove obsolete negative tests qemuxml2argvtest: Modernize all s390 'keywrap' tests qemuxml2argvtest: Modernize all s390 'loadparm' tests qemuxml2argvtest: Modernize s390 cpu tests qemuxml2argvtest: Convert rest of s390 tests to real caps qemuxml2xmltest: Convert all s390 test cases to real capabilities testutilsqemu: Drop fake capability testing infrastructure for 's390'
tests/qemuxml2argvdata/cpu-s390-features.err | 1 - ...gs => cpu-s390-features.s390x-latest.args} | 6 +- tests/qemuxml2xmloutdata/vhost-vsock-ccw.xml | 1 - ...ideo-virtio-gpu-ccw-auto.s390x-latest.xml} | 4 + ... => video-virtio-gpu-ccw.s390x-latest.xml} | 4 +
[...]
tests/qemuxml2xmltest.c | 81 ++++------- tests/testutilsqemu.c | 6 - 65 files changed, 355 insertions(+), 269 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-s390-features.err rename tests/qemuxml2argvdata/{cpu-s390-features.args => cpu-s390-features.s390x-latest.args} (68%) rename tests/qemuxml2argvdata/{cpu-s390-zEC12.args => cpu-s390-zEC12.s390x-latest.args} (67%) [...] rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw-auto.xml => video-virtio-gpu-ccw-auto.s390x-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{video-virtio-gpu-ccw.xml => video-virtio-gpu-ccw.s390x-latest.xml} (89%)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
participants (2)
-
Ján Tomko
-
Peter Krempa