From patchwork Mon Jul 12 10:36:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 58592 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 42E86B6F18 for ; Mon, 12 Jul 2010 20:43:04 +1000 (EST) Received: from localhost ([127.0.0.1]:34426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYGTD-0002ce-5q for incoming@patchwork.ozlabs.org; Mon, 12 Jul 2010 06:42:43 -0400 Received: from [140.186.70.92] (port=58094 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYGNS-0007nd-SY for qemu-devel@nongnu.org; Mon, 12 Jul 2010 06:36:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYGNR-0005uN-IH for qemu-devel@nongnu.org; Mon, 12 Jul 2010 06:36:46 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:40636) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYGNR-0005tk-6g for qemu-devel@nongnu.org; Mon, 12 Jul 2010 06:36:45 -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 D16A9107757; Mon, 12 Jul 2010 19:36:41 +0900 (JST) Received: (nullmailer pid 13678 invoked by uid 1000); Mon, 12 Jul 2010 10:36:44 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Mon, 12 Jul 2010 19:36:42 +0900 Message-Id: <462c32a08da7d99fad73516b77e05b487855d9ee.1278930415.git.yamahata@valinux.co.jp> 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 v2 3/5] 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 | 7 +++---- hw/pci_internals.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hw/pci_bridge.c b/hw/pci_bridge.c index 3f69a44..a5c4ece 100644 --- a/hw/pci_bridge.c +++ b/hw/pci_bridge.c @@ -162,8 +162,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; } @@ -180,8 +179,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;