PCI: Bus number from the bridge, not the device
PATCH RESEND 1/1 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. 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.
Signed-off-by Alex Williamson <[email protected]>
---
hw/pci.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
hw/pci.c +2 -3
@@ -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),
@@ -1831,7 +1830,7 @@ static char *pcibus_get_dev_path(DeviceState *dev)char path[16 ];snprintf (path,sizeof (path),"%04x:%02x:%02x.%x" , -pci_find_domain (d->bus), d->config[PCI_SECONDARY_BUS ], +pci_find_domain (d->bus),pci_bus_num (d->bus),PCI_SLOT (d->devfn),PCI_FUNC (d->devfn));return strdup (path);