External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 05:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Request virtio-mmio for balloon-mmio-deflate

Browse Source 
For all supported QEMU version, the virt machine type has a hard
dependency on PCI support, so if we want to test virtio-balloon
together with virtio-mmio we have to either request that
explicitly or trick libvirt by masking capabilities. Do the
former instead of the latter.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-01-16 15:44:44 +01:00
parent d62c1f5063
commit b519a4cc9d
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemuxml2argvdata/balloon-mmio-deflate.xml
View File

@ -11,6 +11,8 @@
</cpu>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<memballoon model='virtio' autodeflate='on'/>
<memballoon model='virtio' autodeflate='on'>
<address type='virtio-mmio'/>
</memballoon>
</devices>
</domain>

1
tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
View File

@ -20,6 +20,7 @@
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-aarch64</emulator>
<controller type='pci' index='0' model='pcie-root'/>
<audio id='1' type='none'/>
<memballoon model='virtio' autodeflate='on'>
<address type='virtio-mmio'/>

8
tests/qemuxmlconftest.c
View File

@ -1868,13 +1868,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("balloon-device");
DO_TEST_CAPS_LATEST("balloon-device-deflate");
DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x");
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_CAPS_ARCH_LATEST("balloon-mmio-deflate", "aarch64");
DO_TEST_CAPS_LATEST("balloon-device-deflate-off");
DO_TEST_CAPS_LATEST("balloon-device-auto");
DO_TEST_CAPS_LATEST("balloon-device-period");