Commit 6dbcb819 authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

pci: Give a few helpers internal linkage 



None of them should be used in new code.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent af59b35c

hw/pci/pci.c

+7 −7
Original line number Diff line number Diff line
@@ -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

 *       [[<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)

{

    const char *p;
@@ -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;
@@ -1610,8 +1611,7 @@ 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,

static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,

                               const char *default_model,

                               const char *default_devaddr)

{

include/hw/pci/pci.h

+0 −7
Original line number Diff line number Diff line
@@ -371,9 +371,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);
@@ -403,12 +400,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);