Commit 9b717a3a authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by Michael S. Tsirkin
Browse files

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: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c8389550

hw/pci/pci.c

+8 −2
Original line number Diff line number Diff line
@@ -953,6 +953,11 @@ uint16_t pci_requester_id(PCIDevice *dev) 
    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 */

static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,

                                         const char *name, int devfn,
@@ -976,14 +981,15 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, 
    if (devfn < 0) {

        for(devfn = bus->devfn_min ; devfn < ARRAY_SIZE(bus->devices);

            devfn += PCI_FUNC_MAX) {

            if (!bus->devices[devfn])

            if (pci_bus_devfn_available(bus, devfn)) {

                goto found;

            }

        }

        error_setg(errp, "PCI: no slot/function available for %s, all in use",

                   name);

        return NULL;

    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,"

                   " in use by %s",

                   PCI_SLOT(devfn), PCI_FUNC(devfn), name,