From patchwork Tue Jul 13 04:01:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 58703 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D1F09B6F1A for ; Tue, 13 Jul 2010 14:06:03 +1000 (EST) Received: from localhost ([127.0.0.1]:34888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYWk2-00044I-UD for incoming@patchwork.ozlabs.org; Tue, 13 Jul 2010 00:05:11 -0400 Received: from [140.186.70.92] (port=48414 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYWgg-0002sU-8h for qemu-devel@nongnu.org; Tue, 13 Jul 2010 00:01:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYWgW-00083m-2J for qemu-devel@nongnu.org; Tue, 13 Jul 2010 00:01:33 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:59756) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYWgV-00083H-JI for qemu-devel@nongnu.org; Tue, 13 Jul 2010 00:01:32 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id A07E710777B; Tue, 13 Jul 2010 13:01:29 +0900 (JST) Received: (nullmailer pid 23237 invoked by uid 1000); Tue, 13 Jul 2010 04:01:42 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Tue, 13 Jul 2010 13:01:40 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: References: In-Reply-To: References: X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: blauwirbel@gmail.com, yamahata@valinux.co.jp, mst@redhat.com Subject: [Qemu-devel] [PATCH v3 2/4] pci_bridge: rename PCIBridge::bus -> PCIBridge::sec_bus. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org To avoid confusion of primary bus with secondary bus, rename PCIBridge::bus to PCIBridge::sec_bus. Signed-off-by: Isaku Yamahata --- hw/pci_bridge.c | 10 ++++------ hw/pci_internals.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 7f27870..63052fe 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -138,8 +138,7 @@ static void pci_bridge_write_config(PCIDevice *d, io base/limit upper 16 */ ranges_overlap(address, len, PCI_MEMORY_BASE, 20)) { PCIBridge *s = container_of(d, PCIBridge, dev); - PCIBus *secondary_bus = &s->bus; - pci_bridge_update_mappings(secondary_bus); + pci_bridge_update_mappings(&s->sec_bus); } } @@ -164,8 +163,7 @@ static int pci_bridge_initfn(PCIDevice *dev) static int pci_bridge_exitfn(PCIDevice *pci_dev) { PCIBridge *s = DO_UPCAST(PCIBridge, dev, pci_dev); - PCIBus *bus = &s->bus; - pci_unregister_secondary_bus(bus); + pci_unregister_secondary_bus(&s->sec_bus); return 0; } @@ -182,8 +180,8 @@ PCIBus *pci_bridge_init(PCIBus *bus, int devfn, bool multifunction, qdev_init_nofail(&dev->qdev); s = DO_UPCAST(PCIBridge, dev, dev); - pci_register_secondary_bus(bus, &s->bus, &s->dev, map_irq, name); - return &s->bus; + pci_register_secondary_bus(bus, &s->sec_bus, &s->dev, map_irq, name); + return &s->sec_bus; } static PCIDeviceInfo bridge_info = { diff --git a/hw/pci_internals.h b/hw/pci_internals.h index 8a3026b..fa844ab 100644 --- a/hw/pci_internals.h +++ b/hw/pci_internals.h @@ -32,7 +32,7 @@ struct PCIBus { typedef struct { PCIDevice dev; - PCIBus bus; + PCIBus sec_bus; uint32_t vid; uint32_t did; } PCIBridge;