pci: s/pci_find_host_bus/pci_find_root_bus/g
This patch renames pci_find_host_bus() to pci_find_root_bus() as suggested by "Michael S. Tsirkin" <mst@redhat.com>. Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
070297d260
commit
c469e1dd63
@ -113,7 +113,7 @@ void drive_hot_add(Monitor *mon, const QDict *qdict)
|
||||
if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {
|
||||
goto err;
|
||||
}
|
||||
dev = pci_find_device(pci_find_host_bus(0), pci_bus, slot, 0);
|
||||
dev = pci_find_device(pci_find_root_bus(0), pci_bus, slot, 0);
|
||||
if (!dev) {
|
||||
monitor_printf(mon, "no pci device with address %s\n", pci_addr);
|
||||
goto err;
|
||||
@ -257,7 +257,7 @@ void pci_device_hot_remove(Monitor *mon, const char *pci_addr)
|
||||
return;
|
||||
}
|
||||
|
||||
d = pci_find_device(pci_find_host_bus(0), bus, slot, 0);
|
||||
d = pci_find_device(pci_find_root_bus(0), bus, slot, 0);
|
||||
if (!d) {
|
||||
monitor_printf(mon, "slot %d empty\n", slot);
|
||||
return;
|
||||
|
8
hw/pci.c
8
hw/pci.c
@ -146,7 +146,7 @@ static void pci_host_bus_register(int domain, PCIBus *bus)
|
||||
QLIST_INSERT_HEAD(&host_buses, host, next);
|
||||
}
|
||||
|
||||
PCIBus *pci_find_host_bus(int domain)
|
||||
PCIBus *pci_find_root_bus(int domain)
|
||||
{
|
||||
struct PCIHostBus *host;
|
||||
|
||||
@ -372,7 +372,7 @@ static int pci_parse_devaddr(const char *addr, int *domp, int *busp, unsigned *s
|
||||
return -1;
|
||||
|
||||
/* Note: QEMU doesn't implement domains other than 0 */
|
||||
if (!pci_find_bus(pci_find_host_bus(dom), bus))
|
||||
if (!pci_find_bus(pci_find_root_bus(dom), bus))
|
||||
return -1;
|
||||
|
||||
*domp = dom;
|
||||
@ -402,7 +402,7 @@ PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
|
||||
|
||||
if (!devaddr) {
|
||||
*devfnp = -1;
|
||||
return pci_find_bus(pci_find_host_bus(0), 0);
|
||||
return pci_find_bus(pci_find_root_bus(0), 0);
|
||||
}
|
||||
|
||||
if (pci_parse_devaddr(devaddr, &dom, &bus, &slot) < 0) {
|
||||
@ -410,7 +410,7 @@ PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr)
|
||||
}
|
||||
|
||||
*devfnp = slot << 3;
|
||||
return pci_find_bus(pci_find_host_bus(0), bus);
|
||||
return pci_find_bus(pci_find_root_bus(0), bus);
|
||||
}
|
||||
|
||||
static void pci_init_cmask(PCIDevice *dev)
|
||||
|
2
hw/pci.h
2
hw/pci.h
@ -295,7 +295,7 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model,
|
||||
const char *default_devaddr);
|
||||
int pci_bus_num(PCIBus *s);
|
||||
void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d));
|
||||
PCIBus *pci_find_host_bus(int domain);
|
||||
PCIBus *pci_find_root_bus(int domain);
|
||||
PCIBus *pci_find_bus(PCIBus *bus, int bus_num);
|
||||
PCIDevice *pci_find_device(PCIBus *bus, int bus_num, int slot, int function);
|
||||
PCIBus *pci_get_bus_devfn(int *devfnp, const char *devaddr);
|
||||
|
Loading…
Reference in New Issue
Block a user