From patchwork Thu Jul 4 09:13:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 256849 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 D06FC2C008F for ; Thu, 4 Jul 2013 19:43:28 +1000 (EST) Received: from localhost ([::1]:35092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uug4U-0006jq-Lg for incoming@patchwork.ozlabs.org; Thu, 04 Jul 2013 05:43:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UufgT-0005oH-8u for qemu-devel@nongnu.org; Thu, 04 Jul 2013 05:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UufaR-0002st-W8 for qemu-devel@nongnu.org; Thu, 04 Jul 2013 05:12:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32312) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UufaR-0002sa-Ln for qemu-devel@nongnu.org; Thu, 04 Jul 2013 05:12:23 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r649CLLX021007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Jul 2013 05:12:22 -0400 Received: from redhat.com (vpn1-7-171.ams2.redhat.com [10.36.7.171]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r649CKN8004865; Thu, 4 Jul 2013 05:12:20 -0400 Date: Thu, 4 Jul 2013 12:13:32 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1372928939-2712-18-git-send-email-mst@redhat.com> References: <1372928939-2712-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1372928939-2712-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: David Gibson Subject: [Qemu-devel] [PATCH v3 17/18] 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 From: David Gibson 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 Signed-off-by: Michael S. Tsirkin --- 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 e0995aa..d861b40 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); }