diff options
| author | Alex Williamson <alex.williamson@redhat.com> | 2010-10-04 15:53:11 -0600 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2010-11-16 14:53:43 +0200 |
| commit | 7f5feab4dda39b39dce24113313587587aa2d0ab (patch) | |
| tree | e501dabbdc3616b25fb52079b8b03efc28cc4308 | |
| parent | e685b4eb649cbddd26f203b611eabeb714648f4d (diff) | |
| download | qemu-7f5feab4dda39b39dce24113313587587aa2d0ab.zip qemu-7f5feab4dda39b39dce24113313587587aa2d0ab.tar.gz qemu-7f5feab4dda39b39dce24113313587587aa2d0ab.tar.bz2 | |
PCI: Bus number from the bridge, not the device
pcibus_dev_print() was erroneously retrieving the device bus
number from the secondary bus number offset of the device
instead of the bridge above the device. This ends of landing
in the 2nd byte of the 3rd BAR for devices, which thankfully
is usually zero.
Note: pcibus_get_dev_path() copied this code,
inheriting the same bug. pcibus_get_dev_path() is used for
ramblock naming, so changing it can effect migration. However,
I've only seen this byte be non-zero for an assigned device,
which can't migrate anyway, so hopefully we won't run into
any issues.
This patch does not touch pcibus_get_dev_path, as
bus number is guest assigned for nested buses,
so using it for migration is broken anyway.
Fix it properly later.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1806,8 +1806,7 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) monitor_printf(mon, "%*sclass %s, addr %02x:%02x.%x, " "pci id %04x:%04x (sub %04x:%04x)\n", - indent, "", ctxt, - d->config[PCI_SECONDARY_BUS], + indent, "", ctxt, pci_bus_num(d->bus), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), pci_get_word(d->config + PCI_VENDOR_ID), pci_get_word(d->config + PCI_DEVICE_ID), |