[libvirt] [RFC PATCH 04/12] qemu: Relax pci-root index requirement for pSeries guests

Andrea Bolognani abologna at redhat.com
Tue Feb 28 16:12:36 UTC 2017


pSeries guests will soon be allowed to have multiple
PHBs (pci-root controllers), meaning the current check
on the controller index no longer applies to them.
---
 src/qemu/qemu_domain.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3cc827e..77d1107 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3208,7 +3208,10 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                 goto cleanup;
             }
 
-            if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
+            /* pSeries guests can have multiple pci-root controllers,
+             * but other machine types only support a single one */
+            if (!qemuDomainMachineIsPSeries(def) &&
+                cont->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI &&
                 (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT ||
                  cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) &&
                 cont->idx != 0) {
-- 
2.7.4




More information about the libvir-list mailing list