david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pci: Give a few helpers internal linkage

Browse Source 
None of them should be used in new code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2015-02-26 17:21:14 +01:00 committed by Michael S. Tsirkin
parent af59b35ce1
commit 6dbcb81956
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pci/pci.c
View File

@ -539,7 +539,7 @@ static void pci_set_default_subsystem_id(PCIDevice *pci_dev)
* Parse [[<domain>:]<bus>:]<slot>, return -1 on error if funcp == NULL * Parse [[<domain>:]<bus>:]<slot>, return -1 on error if funcp == NULL
* [[<domain>:]<bus>:]<slot>.<func>, return -1 on error * [[<domain>:]<bus>:]<slot>.<func>, return -1 on error
*/ */
int pci_parse_devaddr(const char *addr, int *domp, int *busp, static int pci_parse_devaddr(const char *addr, int *domp, int *busp,
unsigned int *slotp, unsigned int *funcp) unsigned int *slotp, unsigned int *funcp)
{ {
const char *p; const char *p;
@ -598,7 +598,8 @@ int pci_parse_devaddr(const char *addr, int *domp, int *busp,
return 0; 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; int dom, bus;
unsigned slot; unsigned slot;
@ -1610,8 +1611,7 @@ static const char * const pci_nic_names[] = {
}; };
/* Initialize a PCI NIC. */ /* Initialize a PCI NIC. */
/* FIXME callers should check for failure, but don't */ static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,
PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,
const char *default_model, const char *default_model,
const char *default_devaddr) const char *default_devaddr)
{ {

7
include/hw/pci/pci.h
View File

@ -371,9 +371,6 @@ void pci_device_set_intx_routing_notifier(PCIDevice *dev,
PCIINTxRoutingNotifier notifier); PCIINTxRoutingNotifier notifier);
void pci_device_reset(PCIDevice *dev); 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, PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model, const char *default_model,
const char *default_devaddr); const char *default_devaddr);
@ -403,12 +400,8 @@ PCIBus *pci_device_root_bus(const PCIDevice *d);
const char *pci_root_bus_path(PCIDevice *dev); const char *pci_root_bus_path(PCIDevice *dev);
PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn); PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn);
int pci_qdev_find_device(const char *id, PCIDevice **pdev); 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); 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); void pci_device_deassert_intx(PCIDevice *dev);
typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int); typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int);