From patchwork Thu Jun 6 08:48:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 249329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1572B2C0087 for ; Thu, 6 Jun 2013 18:54:15 +1000 (EST) Received: from localhost ([::1]:59688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkVxU-0005Vs-SI for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2013 04:54:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkVsf-0006VB-W7 for qemu-devel@nongnu.org; Thu, 06 Jun 2013 04:49:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkVsT-0000pR-8u for qemu-devel@nongnu.org; Thu, 06 Jun 2013 04:49:13 -0400 Received: from ozlabs.org ([203.10.76.45]:44397) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkVsS-0000ox-TF for qemu-devel@nongnu.org; Thu, 06 Jun 2013 04:49:01 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 1D8DE2C02A3; Thu, 6 Jun 2013 18:48:58 +1000 (EST) From: David Gibson To: aliguori@us.ibm.com, mst@redhat.com Date: Thu, 6 Jun 2013 18:48:53 +1000 Message-Id: <1370508534-12335-10-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1370508534-12335-1-git-send-email-david@gibson.dropbear.id.au> References: <1370508534-12335-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 203.10.76.45 Cc: bonzini@redhat.com, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 09/10] pci: Remove domain from PCIHostBus X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There are now no users of the domain field of PCIHostBus, so remove it from the structure, and as a parameter from the pci_host_bus_register() function which sets it. Signed-off-by: David Gibson --- hw/pci/pci.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 48cc086..b5e3eb8 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -91,7 +91,6 @@ static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET; static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU; struct PCIHostBus { - int domain; struct PCIBus *bus; QLIST_ENTRY(PCIHostBus) next; }; @@ -238,11 +237,10 @@ static int pcibus_reset(BusState *qbus) return 1; } -static void pci_host_bus_register(int domain, PCIBus *bus) +static void pci_host_bus_register(PCIBus *bus) { struct PCIHostBus *host; host = g_malloc0(sizeof(*host)); - host->domain = domain; host->bus = bus; QLIST_INSERT_HEAD(&host_buses, host, next); } @@ -303,7 +301,8 @@ static void pci_bus_init(PCIBus *bus, DeviceState *parent, /* host bridge */ QLIST_INIT(&bus->child); - pci_host_bus_register(0, bus); /* for now only pci domain 0 is supported */ + + pci_host_bus_register(bus); vmstate_register(NULL, -1, &vmstate_pcibus, bus); }