diff options
author | David Gibson | 2013-06-06 10:48:49 +0200 |
---|---|---|
committer | Michael S. Tsirkin | 2013-07-07 22:10:57 +0200 |
commit | 568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe (patch) | |
tree | 0a79e53c7b1666182333bf6f80968174b98d9829 /hw/pci/pci-hotplug-old.c | |
parent | pci: Use helper to find device's root bus in pci_find_domain() (diff) | |
download | qemu-568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe.tar.gz qemu-568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe.tar.xz qemu-568f0690fd9aa4d39d84b04c1a5dbb53a915c3fe.zip |
pci: Replace pci_find_domain() with more general pci_root_bus_path()
pci_find_domain() is used in a number of places where we want an id for a
whole PCI domain (i.e. the subtree under a PCI root bus). The trouble is
that many platforms may support multiple independent host bridges with no
hardware supplied notion of domain number.
This patch, therefore, replaces calls to pci_find_domain() with calls to
a new pci_root_bus_path() returning a string. The new call is implemented
in terms of a new callback in the host bridge class, so it can be defined
in some way that's well defined for the platform. When no callback is
available we fall back on the qbus name.
Most current uses of pci_find_domain() are for error or informational
messages, so the change in identifiers should be harmless. The exception
is pci_get_dev_path(), whose results form part of migration streams. To
maintain compatibility with old migration streams, the PIIX PCI host is
altered to always supply "0000" for this path, which matches the old domain
number (since the code didn't actually support domains other than 0).
For the pseries (spapr) PCI bridge we use a different platform-unique
identifier (pseries machines can routinely have dozens of PCI host
bridges). Theoretically that breaks migration streams, but given that we
don't yet have migration support for pseries, it doesn't matter.
Any other machines that have working migration support including PCI
devices will need to be updated to maintain migration stream compatibility.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/pci/pci-hotplug-old.c')
-rw-r--r-- | hw/pci/pci-hotplug-old.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pci/pci-hotplug-old.c b/hw/pci/pci-hotplug-old.c index 37e0720513..e2518108f4 100644 --- a/hw/pci/pci-hotplug-old.c +++ b/hw/pci/pci-hotplug-old.c @@ -275,8 +275,8 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict) } if (dev) { - monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n", - pci_find_domain(dev), + monitor_printf(mon, "OK root bus %s, bus %d, slot %d, function %d\n", + pci_root_bus_path(dev), pci_bus_num(dev->bus), PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); } else |