conf: Remove dubious code from virDomainPCIAddressSetGrow()

I haven't been able to come up with a single scenario in which
the code in question would be executed; even if there was one,
it would be due to the user specifying a *partial* PCI topology
in the guest XML, which is of course entirely unsupportable and
thus providing even the slightest hint that doing so is in any
way a good idea is actively harmful.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-03-27 14:23:29 +02:00
parent 209d4d6f42
commit 96b1ea4032

View File

@ -477,15 +477,6 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs,
addr->bus++; addr->bus++;
} }
} }
} else if (flags & VIR_PCI_CONNECT_TYPE_PCI_BRIDGE &&
addrs->buses[0].model == VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT) {
/* NB: if the root bus is pci-root, and we couldn't find an
* open place to connect a pci-bridge, then there is nothing
* we can do (since the only way to gain a new slot that
* accepts a pci-bridge is to add *a pci-bridge* (which is the
* reason we're here in the first place!)
*/
model = VIR_DOMAIN_CONTROLLER_MODEL_DMI_TO_PCI_BRIDGE;
} else if (flags & (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE | } else if (flags & (VIR_PCI_CONNECT_TYPE_PCIE_DEVICE |
VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT)) { VIR_PCI_CONNECT_TYPE_PCIE_SWITCH_UPSTREAM_PORT)) {
model = VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT; model = VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT_PORT;