Received: from eggs.gnu.org ([2001:4830:134:3::10]:39027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR1Bm-0007Gx-TI for qemu-devel@nongnu.org; Thu, 26 Feb 2015 11:21:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YR1Be-0007CX-SH for qemu-devel@nongnu.org; Thu, 26 Feb 2015 11:21:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YR1Be-0007CH-Kq for qemu-devel@nongnu.org; Thu, 26 Feb 2015 11:21:18 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1QGLHOe018002 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 26 Feb 2015 11:21:17 -0500 From: Markus Armbruster Date: Thu, 26 Feb 2015 17:21:14 +0100 Message-Id: <1424967674-30106-3-git-send-email-armbru@redhat.com> In-Reply-To: <1424967674-30106-1-git-send-email-armbru@redhat.com> References: <1424967674-30106-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/2] pci: Give a few helpers internal linkage List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com None of them should be used in new code. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- hw/pci/pci.c | 14 +++++++------- include/hw/pci/pci.h | 7 ------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 31b222d..415d03f 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -539,8 +539,8 @@ static void pci_set_default_subsystem_id(PCIDevice *pci_dev) * Parse [[:]:], return -1 on error if funcp == NULL * [[:]:]., return -1 on error */ -int pci_parse_devaddr(const char *addr, int *domp, int *busp, - unsigned int *slotp, unsigned int *funcp) +static int pci_parse_devaddr(const char *addr, int *domp, int *busp, + unsigned int *slotp, unsigned int *funcp) { const char *p; char *e; @@ -598,7 +598,8 @@ int pci_parse_devaddr(const char *addr, int *domp, int *busp, return 0; } -PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr) +static PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, + const char *devaddr) { int dom, bus; unsigned slot; @@ -1605,10 +1606,9 @@ static const char * const pci_nic_names[] = { }; /* Initialize a PCI NIC. */ -/* FIXME callers should check for failure, but don't */ -PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus, - const char *default_model, - const char *default_devaddr) +static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus, + const char *default_model, + const char *default_devaddr) { const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; PCIBus *bus; diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index bdee464..fd59a3b 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -370,9 +370,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev, PCIINTxRoutingNotifier notifier); void pci_device_reset(PCIDevice *dev); -PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus, - const char *default_model, - const char *default_devaddr); PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus, const char *default_model, const char *default_devaddr); @@ -402,12 +399,8 @@ PCIBus *pci_device_root_bus(const PCIDevice *d); const char *pci_root_bus_path(PCIDevice *dev); PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn); int pci_qdev_find_device(const char *id, PCIDevice **pdev); -PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr); void pci_bus_get_w64_range(PCIBus *bus, Range *range); -int pci_parse_devaddr(const char *addr, int *domp, int *busp, - unsigned int *slotp, unsigned int *funcp); - void pci_device_deassert_intx(PCIDevice *dev); typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int); -- 1.9.3