From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dV2xf-0006HX-Ek for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:44:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dV2xc-00007Q-Ld for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:44:51 -0400 Received: from chuckie.co.uk ([82.165.15.123]:35092 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dV2xc-00006Y-ET for qemu-devel@nongnu.org; Tue, 11 Jul 2017 17:44:48 -0400 From: Mark Cave-Ayland Date: Tue, 11 Jul 2017 22:44:32 +0100 Message-Id: <1499809473-28481-2-git-send-email-mark.cave-ayland@ilande.co.uk> In-Reply-To: <1499809473-28481-1-git-send-email-mark.cave-ayland@ilande.co.uk> References: <1499809473-28481-1-git-send-email-mark.cave-ayland@ilande.co.uk> Subject: [Qemu-devel] [PATCHv2 1/2] pci: move check for existing devfn into new pci_bus_devfn_available() helper List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mst@redhat.com, armbru@redhat.com, marcel@redhat.com Also touch up the logic in do_pci_register_device() accordingly. Signed-off-by: Mark Cave-Ayland --- hw/pci/pci.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 0c6f74a..04e6edb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -951,6 +951,15 @@ 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) +{ + if (bus->devices[devfn]) { + return false; + } else { + return true; + } +} + /* -1 for devfn means auto assign */ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, const char *name, int devfn, @@ -974,14 +983,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, -- 1.7.10.4