qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] PCI: Bus number from the bridge, not the device
@ 2010-10-04 21:53 Alex Williamson
  2010-11-08 11:22 ` [Qemu-devel] " Michael S. Tsirkin
  0 siblings, 1 reply; 48+ messages in thread
From: Alex Williamson @ 2010-10-04 21:53 UTC (permalink / raw)
  To: qemu-devel; +Cc: alex.williamson

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 <alex.williamson@redhat.com>
---

 hw/pci.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hw/pci.c b/hw/pci.c
index 6d0934d..15416dd 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1940,8 +1940,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),
@@ -1965,7 +1964,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);

^ permalink raw reply related	[flat|nested] 48+ messages in thread

end of thread, other threads:[~2010-12-21 10:57 UTC | newest]

Thread overview: 48+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-04 21:53 [Qemu-devel] [PATCH] PCI: Bus number from the bridge, not the device Alex Williamson
2010-11-08 11:22 ` [Qemu-devel] " Michael S. Tsirkin
2010-11-08 14:52   ` Alex Williamson
2010-11-08 16:26     ` Michael S. Tsirkin
2010-11-08 16:36       ` Alex Williamson
2010-11-08 16:48         ` Michael S. Tsirkin
2010-11-08 17:00       ` Gleb Natapov
2010-11-08 17:08         ` Michael S. Tsirkin
2010-11-08 17:27           ` Gleb Natapov
2010-11-09  2:41       ` Isaku Yamahata
2010-11-09 11:53         ` Michael S. Tsirkin
2010-11-19 17:02           ` Markus Armbruster
2010-11-19 20:38             ` Gleb Natapov
2010-11-20 20:17               ` Michael S. Tsirkin
2010-11-21  8:32                 ` Gleb Natapov
2010-11-21  9:50                   ` Michael S. Tsirkin
2010-11-21 10:19                     ` Gleb Natapov
2010-11-21 11:53                       ` Michael S. Tsirkin
2010-11-21 12:50                         ` Gleb Natapov
2010-11-21 14:48                           ` Michael S. Tsirkin
2010-11-21 16:01                             ` Gleb Natapov
2010-11-21 16:38                               ` Michael S. Tsirkin
2010-11-21 17:28                                 ` Gleb Natapov
2010-11-21 18:22                               ` Michael S. Tsirkin
2010-11-21 19:29                                 ` Gleb Natapov
2010-11-21 20:39                                   ` Michael S. Tsirkin
2010-11-22  7:37                                     ` Gleb Natapov
2010-11-22  8:16                                       ` Michael S. Tsirkin
2010-11-22 13:04                                         ` Gleb Natapov
2010-11-22 14:50                                           ` Michael S. Tsirkin
2010-11-22 14:52                                             ` Gleb Natapov
2010-11-22 14:56                                               ` Michael S. Tsirkin
2010-11-22 14:58                                                 ` Gleb Natapov
2010-11-22 16:41                                                   ` Michael S. Tsirkin
2010-11-22 17:01                                                     ` Gleb Natapov
2010-12-13 20:04   ` Alex Williamson
2010-12-14  4:46     ` Michael S. Tsirkin
2010-12-14  4:49       ` Alex Williamson
2010-12-14  4:57         ` Michael S. Tsirkin
2010-12-14  5:04           ` Alex Williamson
2010-12-14 12:26             ` Michael S. Tsirkin
2010-12-14 18:34               ` Alex Williamson
2010-12-15  9:56                 ` Michael S. Tsirkin
2010-12-15 15:27                   ` Alex Williamson
2010-12-16  7:08                     ` Isaku Yamahata
2010-12-16  8:36                       ` Michael S. Tsirkin
2010-12-21 10:13                         ` Isaku Yamahata
2010-12-21 10:56                           ` Michael S. Tsirkin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).