From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37753 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PETVf-0005n0-1n for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:07:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PETVe-0001Nw-1j for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:07:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6294) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PETVd-0001Ns-Pz for qemu-devel@nongnu.org; Fri, 05 Nov 2010 17:07:42 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oA5L7den008115 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Nov 2010 17:07:40 -0400 From: Alex Williamson Date: Fri, 05 Nov 2010 15:07:38 -0600 Message-ID: <20101105210705.18635.9391.stgit@s20.home> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH RESEND] PCI: Bus number from the bridge, not the device List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com 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 --- hw/pci.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 962886e..7d12473 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -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);