[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 14/18] pci: Add root bus argument to pci_get_bus_d
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v4 14/18] pci: Add root bus argument to pci_get_bus_devfn() |
Date: |
Sun, 7 Jul 2013 23:20:20 +0300 |
From: David Gibson <address@hidden>
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: David Gibson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci/pci-hotplug-old.c | 4 ++--
hw/pci/pci.c | 7 ++++---
include/hw/pci/pci.h | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/pci/pci-hotplug-old.c b/hw/pci/pci-hotplug-old.c
index e251810..e92d646 100644
--- a/hw/pci/pci-hotplug-old.c
+++ b/hw/pci/pci-hotplug-old.c
@@ -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;
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 350b872..c4f63ad 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -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]);
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index e0597b7..3a43fba 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -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);
--
MST
- [Qemu-devel] [PULL v4 04/18] pc_piix: cleanup init compat handling, (continued)
- [Qemu-devel] [PULL v4 04/18] pc_piix: cleanup init compat handling, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 05/18] e1000: cleanup process_tx_desc, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 06/18] MAINTAINERS: s/Marcelo/Paolo/, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 08/18] pvpanic: fix fwcfg for big endian hosts, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 07/18] pvpanic: initialization cleanup, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 10/18] pci: Move pci_read_devaddr to pci-hotplug-old.c, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 09/18] pci: Cleanup configuration for pci-hotplug.c, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 12/18] pci: Use helper to find device's root bus in pci_find_domain(), Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 13/18] pci: Replace pci_find_domain() with more general pci_root_bus_path(), Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 11/18] pci: Abolish pci_find_root_bus(), Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 14/18] pci: Add root bus argument to pci_get_bus_devfn(),
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v4 16/18] pci: Simpler implementation of primary PCI bus, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 17/18] pci: Remove domain from PCIHostBus, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 18/18] pci: Fold host_buses list into PCIHostState functionality, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 02/18] pci: store PCI hole ranges in guestinfo structure, Michael S. Tsirkin, 2013/07/07
- [Qemu-devel] [PULL v4 15/18] pci: Add root bus parameter to pci_nic_init(), Michael S. Tsirkin, 2013/07/07
- Re: [Qemu-devel] [PULL v4 00/18] pci,misc enhancements, Stefano Stabellini, 2013/07/10