From 85a30c7570dedbde4ee34c157d6eeaadd5cdcdad Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 24 Mar 2023 15:26:22 +0100 Subject: [PATCH] qemuxml2argvtest: Modernize all s390 'loadparm' tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use latest caps for the tests. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- ...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");