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

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>

diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml
index a749bf31a231d22a22d1e09cc8a511c04bb1cb56..cb4ad0d347fc1f5cf73718560cc7f667ef64e18a 100644 (file)
--- 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/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
index 8aeb19197917eb17dbe0858b69259cdfdc64dc31..98065d28d42952cab1605928f3ed146f6c2c4264 100644 (file)
--- a/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/balloon-mmio-deflate.aarch64-latest.xml
@@ -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'/>

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index eb2b119ee08b044844a8c308b2a3b1a8d6c970f2..65953b129b0adfc3201ec02f30c71ffac32d2daf 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -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");