[PATCH 07/22] tests: qemuxml2argv: Modernize 's390-allow-bogus-usb-none' test

The 's390-virtio' machine was removed from qemu in the 2.6 release. Use the more modern s390-ccw-virtio machine type and use VIR_TEST_CAPS_ARCH_LATEST to invoke it. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- .../s390-allow-bogus-usb-none.args | 31 --------------- ...390-allow-bogus-usb-none.s390x-latest.args | 39 +++++++++++++++++++ .../s390-allow-bogus-usb-none.xml | 2 +- tests/qemuxml2argvtest.c | 5 +-- 4 files changed, 41 insertions(+), 36 deletions(-) delete mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args create mode 100644 tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args deleted file mode 100644 index fd698eaa46..0000000000 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args +++ /dev/null @@ -1,31 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/tmp/lib/domain--1-test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ -XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ -XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ -QEMU_AUDIO_DRV=none \ -/usr/bin/qemu-system-s390x \ --name test \ --S \ --machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \ --m 214 \ --realtime mlock=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,path=/tmp/lib/domain--1-test/monitor.sock,server=on,wait=off \ --mon chardev=charmonitor,id=monitor,mode=control \ --rtc base=utc \ --no-shutdown \ --device virtio-serial-s390,id=virtio-serial0 \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \ --device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ --chardev pty,id=charconsole0 \ --device virtconsole,chardev=charconsole0,id=console0 \ --object rng-random,id=objrng0,filename=/dev/hwrng \ --device virtio-rng-s390,rng=objrng0,id=rng0 diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args new file mode 100644 index 0000000000..527141d70a --- /dev/null +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.s390x-latest.args @@ -0,0 +1,39 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/tmp/lib/domain--1-test \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \ +XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \ +XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=test,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test/master-key.aes"}' \ +-machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-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 \ +-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \ +-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 \ +-chardev pty,id=charconsole0 \ +-device virtconsole,chardev=charconsole0,id=console0 \ +-audiodev id=audio1,driver=none \ +-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/hwrng"}' \ +-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0003 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml index 8429939563..c0b2da6569 100644 --- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml +++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.xml @@ -4,7 +4,7 @@ <memory>219100</memory> <currentMemory>219100</currentMemory> <os> - <type arch='s390x' machine='s390-virtio'>hvm</type> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index daf702cab6..d4b6cb680c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2540,10 +2540,7 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("s390-allow-bogus-usb-none", - QEMU_CAPS_VIRTIO_S390, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x"); DO_TEST("s390-allow-bogus-usb-controller", QEMU_CAPS_VIRTIO_S390, QEMU_CAPS_DEVICE_VIRTIO_RNG, -- 2.31.1