On Wed, Jan 17, 2024 at 10:54:41 +0100, Andrea Bolognani wrote:
> It's impossible to compile out PCI support on aarch64, 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.
While same idea about non-virt machines not mandating PCI applies, which
would make the commit message misleading ...
> Signed-off-by: Andrea Bolognani <abologna@xxxxxxxxxx>
> ---
> tests/qemuxml2argvdata/balloon-mmio-deflate.xml | 4 +++-
> tests/qemuxml2argvtest.c | 8 +-------
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
> index a749bf31a2..cb4ad0d347 100644
> --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
> +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
> @@ -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>
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index fd89dbe649..5b36a297e0 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1719,13 +1719,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");
... this bit makes sense.
Reviewed-by: Peter Krempa <pkrempa@xxxxxxxxxx>
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
