9:47 a.m.
In order to simplify the code and make it possible to recalculate the
PCI address set, I incorporated qemuDomainValidateDevicePCISlotsChipsets
into qemuDomainPCIAddressSetCreate.
Three functions had to be moved up to be seen in
qemuDomainPCIAddressSetCreate.
---
src/qemu/qemu_domain_address.c | 132 ++++++++++++++++++++---------------------
1 file changed, 65 insertions(+), 67 deletions(-)
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 3d52d72..2e19905 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -538,63 +538,6 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED,
return ret;
}
-static virDomainPCIAddressSetPtr
-qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
- unsigned int nbuses,
- bool dryRun)
-{
- virDomainPCIAddressSetPtr addrs;
- size_t i;
-
- if ((addrs = virDomainPCIAddressSetAlloc(nbuses)) == NULL)
- return NULL;
-
- addrs->nbuses = nbuses;
- addrs->dryRun = dryRun;
-
- /* As a safety measure, set default model='pci-root' for first pci
- * controller and 'pci-bridge' for all subsequent. After setting
- * those defaults, then scan the config and set the actual model
- * for all addrs[idx]->bus that already have a corresponding
- * controller in the config.
- *
- */
- if (nbuses > 0)
- virDomainPCIAddressBusSetModel(&addrs->buses[0],
- VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT);
- for (i = 1; i < nbuses; i++) {
- virDomainPCIAddressBusSetModel(&addrs->buses[i],
- VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE);
- }
-
- for (i = 0; i < def->ncontrollers; i++) {
- size_t idx = def->controllers[i]->idx;
-
- if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI)
- continue;
-
- if (idx >= addrs->nbuses) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- _("Inappropriate new pci controller index %zu "
- "not found in addrs"), idx);
- goto error;
- }
-
- if (virDomainPCIAddressBusSetModel(&addrs->buses[idx],
- def->controllers[i]->model) < 0)
- goto error;
- }
-
- if (virDomainDeviceInfoIterate(def, qemuDomainCollectPCIAddress, addrs) < 0)
- goto error;
-
- return addrs;
-
- error:
- virDomainPCIAddressSetFree(addrs);
- return NULL;
-}
-
static int
qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
@@ -941,6 +884,69 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
}
+static virDomainPCIAddressSetPtr
+qemuDomainPCIAddressSetCreate(virDomainDefPtr def,
+ unsigned int nbuses,
+ virQEMUCapsPtr qemuCaps,
+ bool dryRun)
+{
+ virDomainPCIAddressSetPtr addrs;
+ size_t i;
+
+ if ((addrs = virDomainPCIAddressSetAlloc(nbuses)) == NULL)
+ return NULL;
+
+ addrs->nbuses = nbuses;
+ addrs->dryRun = dryRun;
+
+ /* As a safety measure, set default model='pci-root' for first pci
+ * controller and 'pci-bridge' for all subsequent. After setting
+ * those defaults, then scan the config and set the actual model
+ * for all addrs[idx]->bus that already have a corresponding
+ * controller in the config.
+ *
+ */
+ if (nbuses > 0)
+ virDomainPCIAddressBusSetModel(&addrs->buses[0],
+ VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT);
+ for (i = 1; i < nbuses; i++) {
+ virDomainPCIAddressBusSetModel(&addrs->buses[i],
+ VIR_DOMAIN_CONTROLLER_MODEL_PCI_BRIDGE);
+ }
+
+ for (i = 0; i < def->ncontrollers; i++) {
+ size_t idx = def->controllers[i]->idx;
+
+ if (def->controllers[i]->type != VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+ continue;
+
+ if (idx >= addrs->nbuses) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("Inappropriate new pci controller index %zu "
+ "not found in addrs"), idx);
+ goto error;
+ }
+
+ if (virDomainPCIAddressBusSetModel(&addrs->buses[idx],
+ def->controllers[i]->model) < 0)
+ goto error;
+ }
+
+ if (virDomainDeviceInfoIterate(def, qemuDomainCollectPCIAddress, addrs) < 0)
+ goto error;
+
+ if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps,
+ addrs) < 0)
+ goto error;
+
+ return addrs;
+
+ error:
+ virDomainPCIAddressSetFree(addrs);
+ return NULL;
+}
+
+
static bool
qemuDomainPCIBusFullyReserved(virDomainPCIAddressBusPtr bus)
{
@@ -1455,11 +1461,7 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
virDomainDeviceInfo info;
/* 1st pass to figure out how many PCI bridges we need */
- if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, true)))
- goto cleanup;
-
- if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps,
- addrs) < 0)
+ if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, qemuCaps, true)))
goto cleanup;
for (i = 0; i < addrs->nbuses; i++) {
@@ -1506,12 +1508,8 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def,
goto cleanup;
}
- if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, false)))
- goto cleanup;
-
if (qemuDomainSupportsPCI(def, qemuCaps)) {
- if (qemuDomainValidateDevicePCISlotsChipsets(def, qemuCaps,
- addrs) < 0)
+ if (!(addrs = qemuDomainPCIAddressSetCreate(def, nbuses, qemuCaps, false)))
goto cleanup;
if (qemuDomainAssignDevicePCISlots(def, qemuCaps, addrs) < 0)
--
1.9.1