diff options
| author | Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> | 2017-07-16 21:27:33 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2017-09-08 16:15:17 +0300 |
| commit | 9b717a3a1318455afce761301fec114982ccbf1f (patch) | |
| tree | 41f533153a1b830179be19aa8ce8dcf8b5dfe83e /hw | |
| parent | c8389550dedc65892fba9c3df29423efd802f544 (diff) | |
| download | qemu-9b717a3a1318455afce761301fec114982ccbf1f.zip qemu-9b717a3a1318455afce761301fec114982ccbf1f.tar.gz qemu-9b717a3a1318455afce761301fec114982ccbf1f.tar.bz2 | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/pci.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 26f346d..002e669 100644 --- a/hw/pci/pci.c +++ b/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); } +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, |