[PATCH 09/21] qemuxml2argvtest: Modernize 'balloon-mmio-deflate'

Use real capabilities and mask-out support for PCIe. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- ...e.args => balloon-mmio-deflate.aarch64-latest.args} | 8 +++++--- tests/qemuxml2argvtest.c | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) rename tests/qemuxml2argvdata/{balloon-mmio-deflate.args => balloon-mmio-deflate.aarch64-latest.args} (67%) diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args similarity index 67% rename from tests/qemuxml2argvdata/balloon-mmio-deflate.args rename to tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args index 1c05dd6484..c26a05bf81 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args @@ -9,11 +9,12 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ /usr/bin/qemu-system-aarch64 \ -name guest=aarch64test,debug-threads=on \ -S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes \ --machine virt,usb=off,gic-version=2,dump-guest-core=off \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \ -accel tcg \ -cpu cortex-a53 \ -m 1024 \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ -overcommit mem-lock=off \ -smp 1,sockets=1,cores=1,threads=1 \ -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ @@ -31,5 +32,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ -dtb /aarch64.dtb \ -audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-device,id=balloon0,deflate-on-oom=on \ +-device '{"driver":"virtio-balloon-device","id":"balloon0","deflate-on-oom":true}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0bf5bf23b0..93c246bc9b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1703,9 +1703,13 @@ mymain(void) DO_TEST("balloon-device-deflate", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); - DO_TEST("balloon-mmio-deflate", - QEMU_CAPS_DEVICE_VIRTIO_MMIO, - QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); + DO_TEST_FULL("balloon-mmio-deflate", ".aarch64-latest", + ARG_CAPS_ARCH, "aarch64", + ARG_CAPS_VER, "latest", + ARG_QEMU_CAPS_DEL, + QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, + QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, + QEMU_CAPS_LAST, ARG_END); DO_TEST("balloon-device-deflate-off", QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE); DO_TEST_NOCAPS("balloon-device-auto"); -- 2.39.2