From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1aNY-00018w-AL for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1aNX-0006tG-5t for qemu-devel@nongnu.org; Wed, 15 Aug 2012 05:59:08 -0400 From: Alexander Graf Date: Wed, 15 Aug 2012 11:58:40 +0200 Message-Id: <1345024742-18394-3-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 02/24] pseries pci: spapr_populate_pci_devices renamed to spapr_populate_pci_dt 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 From: Alexey Kardashevskiy spapr_populate_pci_devices() populates the device tree only with bus properties and has nothing to do with the devices on it as PCI BAR allocation is done by the system firmware (SLOF). New name - spapr_populate_pci_dt() - describes the functionality better. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Alexander Graf --- hw/spapr.c | 2 +- hw/spapr_pci.c | 6 +++--- hw/spapr_pci.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/spapr.c b/hw/spapr.c index 81c9343..ab5a0c2 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -481,7 +481,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spapr, } QLIST_FOREACH(phb, &spapr->phbs, list) { - ret = spapr_populate_pci_devices(phb, PHANDLE_XICP, fdt); + ret = spapr_populate_pci_dt(phb, PHANDLE_XICP, fdt); } if (ret < 0) { diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c index 5bee180..2913540 100644 --- a/hw/spapr_pci.c +++ b/hw/spapr_pci.c @@ -406,9 +406,9 @@ void spapr_create_phb(sPAPREnvironment *spapr, #define b_fff(x) b_x((x), 8, 3) /* function number */ #define b_rrrrrrrr(x) b_x((x), 0, 8) /* register number */ -int spapr_populate_pci_devices(sPAPRPHBState *phb, - uint32_t xics_phandle, - void *fdt) +int spapr_populate_pci_dt(sPAPRPHBState *phb, + uint32_t xics_phandle, + void *fdt) { int bus_off, i, j; char nodename[256]; diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h index a141764..dd66f4b 100644 --- a/hw/spapr_pci.h +++ b/hw/spapr_pci.h @@ -55,8 +55,8 @@ void spapr_create_phb(sPAPREnvironment *spapr, uint64_t mem_win_addr, uint64_t mem_win_size, uint64_t io_win_addr); -int spapr_populate_pci_devices(sPAPRPHBState *phb, - uint32_t xics_phandle, - void *fdt); +int spapr_populate_pci_dt(sPAPRPHBState *phb, + uint32_t xics_phandle, + void *fdt); #endif /* __HW_SPAPR_PCI_H__ */ -- 1.6.0.2