提交 b59bbdba 编写于 作者: L Laine Stump

conf: fix fromConfig argument to virDomainPCIAddressValidate()

fromConfig should be true if the caller wants
virDomainPCIAddressValidate() to loosen restrictions on its
interpretation of the pciConnectFlags. In particular, either
PCI_DEVICE or PCIE_DEVICE will be counted as equivalent to both, and
HOTPLUG will be ignored. In a few cases where libvirt was manually
overriding automatic address assignment, it was setting fromConfig to
false when validating the hardcoded manual override. This patch
changes those to fromConfig=true as a preemptive strike against any
future bugs that might otherwise surface.
上级 79901543
......@@ -660,7 +660,7 @@ virDomainPCIAddressReleaseSlot(virDomainPCIAddressSetPtr addrs,
if (!(addrStr = virDomainPCIAddressAsString(addr)))
goto cleanup;
if (!virDomainPCIAddressValidate(addrs, addr, addrStr, flags, false))
if (!virDomainPCIAddressValidate(addrs, addr, addrStr, flags, true))
goto cleanup;
addrs->buses[addr->bus].slot[addr->slot].functions = 0;
......
......@@ -1207,7 +1207,7 @@ qemuDomainValidateDevicePCISlotsPIIX3(virDomainDefPtr def,
if (!(addrStr = virDomainPCIAddressAsString(&tmp_addr)))
goto cleanup;
if (!virDomainPCIAddressValidate(addrs, &tmp_addr,
addrStr, flags, false))
addrStr, flags, true))
goto cleanup;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
......@@ -1396,7 +1396,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
if (!(addrStr = virDomainPCIAddressAsString(&tmp_addr)))
goto cleanup;
if (!virDomainPCIAddressValidate(addrs, &tmp_addr,
addrStr, flags, false))
addrStr, flags, true))
goto cleanup;
if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册