pci: move check for existing devfn into new pci_bus_devfn_available() helper
Also touch up the logic in do_pci_register_device() accordingly. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
c8389550de
commit
9b717a3a13
10
hw/pci/pci.c
10
hw/pci/pci.c
|
@ -953,6 +953,11 @@ uint16_t pci_requester_id(PCIDevice *dev)
|
||||||
return pci_req_id_cache_extract(&dev->requester_id_cache);
|
return pci_req_id_cache_extract(&dev->requester_id_cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool pci_bus_devfn_available(PCIBus *bus, int devfn)
|
||||||
|
{
|
||||||
|
return !(bus->devices[devfn]);
|
||||||
|
}
|
||||||
|
|
||||||
/* -1 for devfn means auto assign */
|
/* -1 for devfn means auto assign */
|
||||||
static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
|
static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
|
||||||
const char *name, int devfn,
|
const char *name, int devfn,
|
||||||
|
@ -976,14 +981,15 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
|
||||||
if (devfn < 0) {
|
if (devfn < 0) {
|
||||||
for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices);
|
for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices);
|
||||||
devfn += PCI_FUNC_MAX) {
|
devfn += PCI_FUNC_MAX) {
|
||||||
if (!bus->devices[devfn])
|
if (pci_bus_devfn_available(bus, devfn)) {
|
||||||
goto found;
|
goto found;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
error_setg(errp, "PCI: no slot/function available for %s, all in use",
|
error_setg(errp, "PCI: no slot/function available for %s, all in use",
|
||||||
name);
|
name);
|
||||||
return NULL;
|
return NULL;
|
||||||
found: ;
|
found: ;
|
||||||
} else if (bus->devices[devfn]) {
|
} else if (!pci_bus_devfn_available(bus, devfn)) {
|
||||||
error_setg(errp, "PCI: slot %d function %d not available for %s,"
|
error_setg(errp, "PCI: slot %d function %d not available for %s,"
|
||||||
" in use by %s",
|
" in use by %s",
|
||||||
PCI_SLOT(devfn), PCI_FUNC(devfn), name,
|
PCI_SLOT(devfn), PCI_FUNC(devfn), name,
|
||||||
|
|
Loading…
Reference in a new issue