From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51036) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0T3D-000535-D0 for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0T3A-0001jV-HT for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:11:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0T3A-0001jR-CR for qemu-devel@nongnu.org; Thu, 04 Jun 2015 07:11:04 -0400 Date: Thu, 4 Jun 2015 13:11:01 +0200 From: "Michael S. Tsirkin" Message-ID: <1433416111-19022-17-git-send-email-mst@redhat.com> References: <1433416111-19022-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433416111-19022-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 16/28] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Peter Maydell , Laszlo Ersek , Eduardo Habkost , Marcel Apfelbaum From: Marcel Apfelbaum Use the newer pci_bus_num to correctly get the root bus number. Signed-off-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Acked-by: Laszlo Ersek --- hw/pci/pci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 3361d85..a956640 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1594,7 +1594,8 @@ PciInfoList *qmp_query_pci(Error **errp) QLIST_FOREACH(host_bridge, &pci_host_bridges, next) { info = g_malloc0(sizeof(*info)); - info->value = qmp_query_pci_bus(host_bridge->bus, 0); + info->value = qmp_query_pci_bus(host_bridge->bus, + pci_bus_num(host_bridge->bus)); /* XXX: waiting for the qapi to support GSList */ if (!cur_item) { -- MST