Commit 6ac363b5 authored by David Gibson's avatar David Gibson Committed by Michael S. Tsirkin
Browse files

pci: Move pci_read_devaddr to pci-hotplug-old.c 



pci_read_devaddr() is only used by the legacy functions for the old PCI
hotplug interface in pci-hotplug-old.c.  So we move the function there,
and make it static.

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

hw/pci/pci-hotplug-old.c

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,20 @@ 
#include "sysemu/blockdev.h"

#include "qapi/error.h"



static int pci_read_devaddr(Monitor *mon, const char *addr, int *domp,

                            int *busp, unsigned *slotp)

{

    /* strip legacy tag */

    if (!strncmp(addr, "pci_addr=", 9)) {

        addr += 9;

    }

    if (pci_parse_devaddr(addr, domp, busp, slotp, NULL)) {

        monitor_printf(mon, "Invalid pci address\n");

        return -1;

    }

    return 0;

}



static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,

                                       const char *devaddr,

                                       const char *opts_str)

hw/pci/pci.c

+1 −15
Original line number Diff line number Diff line
@@ -522,7 +522,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

 */

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

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

                      unsigned int *slotp, unsigned int *funcp)

{

    const char *p;
@@ -581,20 +581,6 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp, 
    return 0;

}



int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp,

                     unsigned *slotp)

{

    /* strip legacy tag */

    if (!strncmp(addr, "pci_addr=", 9)) {

        addr += 9;

    }

    if (pci_parse_devaddr(addr, domp, busp, slotp, NULL)) {

        monitor_printf(mon, "Invalid pci address\n");

        return -1;

    }

    return 0;

}



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

{

    int dom, bus;

include/hw/pci/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -395,8 +395,8 @@ 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);



int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp,

                     unsigned *slotp);

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

                      unsigned int *slotp, unsigned int *funcp);



void pci_device_deassert_intx(PCIDevice *dev);