From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:35344) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1aNo-0001xj-Gr for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1aNm-000725-PO for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:24 -0400 From: Alexander Graf Date: Wed, 15 Aug 2012 11:58:57 +0200 Message-Id: <1345024742-18394-20-git-send-email-agraf@suse.de> In-Reply-To: <1345024742-18394-1-git-send-email-agraf@suse.de> References: <1345024742-18394-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 19/24] pseries: Export find_phb() utility function for PCI code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc Mailing List Cc: Blue Swirl , Alexey Kardashevskiy , qemu-devel qemu-devel , Aurelien Jarno , David Gibson From: Alexey Kardashevskiy The pseries PCI code makes use of an internal find_dev() function which locates a PCIDevice * given a (platform specific) bus ID and device address. Internally this needs to first locate the host bridge on which the device resides based on the bus ID. This patch exposes that host bridge lookup as a separate function, which we will need later in the MSI and VFIO code. Signed-off-by: Alexey Kardashevskiy Signed-off-by: David Gibson [agraf: drop trace.h inclusion] Signed-off-by: Alexander Graf --- hw/spapr_pci.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index fcc358e..2e38fee 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -32,24 +32,35 @@ #include "hw/pci_internals.h" -static PCIDevice *find_dev(sPAPREnvironment *spapr, - uint64_t buid, uint32_t config_addr) +static sPAPRPHBState *find_phb(sPAPREnvironment *spapr, uint64_t buid) { - int devfn = (config_addr >> 8) & 0xFF; sPAPRPHBState *phb; QLIST_FOREACH(phb, &spapr->phbs, list) { - BusChild *kid; - if (phb->buid != buid) { continue; } + return phb; + } + + return NULL; +} + +static PCIDevice *find_dev(sPAPREnvironment *spapr, uint64_t buid, + uint32_t config_addr) +{ + sPAPRPHBState *phb = find_phb(spapr, buid); + BusChild *kid; + int devfn = (config_addr >> 8) & 0xFF; + + if (!phb) { + return NULL; + } - QTAILQ_FOREACH(kid, &phb->host_state.bus->qbus.children, sibling) { - PCIDevice *dev = (PCIDevice *)kid->child; - if (dev->devfn == devfn) { - return dev; - } + QTAILQ_FOREACH(kid, &phb->host_state.bus->qbus.children, sibling) { + PCIDevice *dev = (PCIDevice *)kid->child; + if (dev->devfn == devfn) { + return dev; } } -- 1.6.0.2