Commit 85c6e4fa authored by David Gibson's avatar David Gibson Committed by Michael S. Tsirkin
Browse files

pci: Add root bus argument to pci_get_bus_devfn() 



pci_get_bus_devfn() interprets a full PCI address string to give a PCIBus *
and device/function number within that bus.  Currently it assumes it is
working on an address under the primary PCI root bus.  This patch extends
it to allow the caller to specify a root bus.  This might seem a little odd
since the supplied address can (theoretically) include a PCI domain number.
However, attempting to use a non-zero domain number there is currently an
error, so that shouldn't really cause problems.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 568f0690

hw/pci/pci-hotplug-old.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, 
    PCIBus *bus;

    int ret, devfn;



    bus = pci_get_bus_devfn(&devfn, devaddr);

    bus = pci_get_bus_devfn(&devfn, pci_find_primary_bus(), devaddr);

    if (!bus) {

        monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);

        return NULL;
@@ -205,7 +205,7 @@ static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon, 
        dinfo = NULL;

    }



    bus = pci_get_bus_devfn(&devfn, devaddr);

    bus = pci_get_bus_devfn(&devfn, pci_find_primary_bus(), devaddr);

    if (!bus) {

        monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);

        return NULL;

hw/pci/pci.c

+4 −3
Original line number Diff line number Diff line
@@ -589,12 +589,13 @@ int pci_parse_devaddr(const char *addr, int *domp, int *busp, 
    return 0;

}



PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)

PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr)

{

    PCIBus *root = pci_find_primary_bus();

    int dom, bus;

    unsigned slot;



    assert(!root->parent_dev);



    if (!root) {

        fprintf(stderr, "No primary PCI bus\n");

        return NULL;
@@ -1588,7 +1589,7 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, 
    if (i < 0)

        return NULL;



    bus = pci_get_bus_devfn(&devfn, devaddr);

    bus = pci_get_bus_devfn(&devfn, pci_find_primary_bus(), devaddr);

    if (!bus) {

        error_report("Invalid PCI device address %s for device %s",

                     devaddr, pci_nic_names[i]);

include/hw/pci/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ 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, const char *devaddr);

PCIBus *pci_get_bus_devfn(int *devfnp, PCIBus *root, const char *devaddr);



int pci_parse_devaddr(const char *addr, int *domp, int *busp,

                      unsigned int *slotp, unsigned int *funcp);