qemu: Allow pcie-expander-bus for aarch64/virt guests

Starting with QEMU 6.0, this controller is enabled by default
on aarch64.

https://bugzilla.redhat.com/show_bug.cgi?id=1967187

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7e2efc81683e2fe3f4d58a2be7076ccfcf56b94b..385d0c152684f421d63b8a0351c2d4c30c075f30 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5222,10 +5222,10 @@ qemuDomainControllerDefPostParse(virDomainControllerDef *cont,
             return -1;
         }
         if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_EXPANDER_BUS &&
-            !qemuDomainIsQ35(def)) {
+            !(qemuDomainIsQ35(def) || qemuDomainIsARMVirt(def))) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("pcie-expander-bus controllers are only supported "
-                             "on q35-based machinetypes"));
+                           _("pcie-expander-bus controllers are not supported "
+                             "with this machine type"));
             return -1;
         }
 

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err
index 9b58aaddd6d0ef5a42701c084d41c3d4655962a5..06967dbbcdc1b1bfe63914206922cc82b5193946 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err
@@ -1 +1 @@
-unsupported configuration: pcie-expander-bus controllers are only supported on q35-based machinetypes
+unsupported configuration: pcie-expander-bus controllers are not supported with this machine type