[libvirt PATCH 2/3] qemu: Allow pcie-expander-bus for aarch64/virt guests

Andrea Bolognani abologna at redhat.com
Fri Jul 23 16:04:03 UTC 2021


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 at redhat.com>
---
 src/qemu/qemu_domain.c                                   | 6 +++---
 tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.err | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b919da6eab..4ebd633088 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5225,10 +5225,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 9b58aaddd6..06967dbbcd 100644
--- 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
-- 
2.31.1




More information about the libvir-list mailing list