From patchwork Tue Jul 27 06:23:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 59976 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 88997B6EE9 for ; Tue, 27 Jul 2010 16:30:36 +1000 (EST) Received: from localhost ([127.0.0.1]:38614 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OddgP-00062U-6z for incoming@patchwork.ozlabs.org; Tue, 27 Jul 2010 02:30:33 -0400 Received: from [140.186.70.92] (port=36698 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OddW6-0002Bh-E6 for qemu-devel@nongnu.org; Tue, 27 Jul 2010 02:19:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OddW4-0007UP-4Z for qemu-devel@nongnu.org; Tue, 27 Jul 2010 02:19:54 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:40499) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OddW3-0007ST-MW for qemu-devel@nongnu.org; Tue, 27 Jul 2010 02:19:52 -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 6DABE10792B; Tue, 27 Jul 2010 15:19:47 +0900 (JST) Received: (nullmailer pid 31044 invoked by uid 1000); Tue, 27 Jul 2010 06:23:25 -0000 From: Isaku Yamahata To: qemu-devel@nongnu.org Date: Tue, 27 Jul 2010 15:23:22 +0900 Message-Id: X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <20100727035430.GA12490@volta.aurel32.net> References: <20100727035430.GA12490@volta.aurel32.net> 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: yamahata@valinux.co.jp, aurelien@aurel32.net, mst@redhat.com Subject: [Qemu-devel] [PATCH for master 1/3] pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info. 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 move out pci internal structures, PCIBus, PCIBridge and pci_bus_info into private header file, pci_internals.h. This is a preparation. Later pci bridge implementation will be split out form pci.c into pci_bridge.c. Signed-off-by: Isaku Yamahata Signed-off-by: Michael S. Tsirkin --- hw/pci.c | 32 ++------------------------------ hw/pci_internals.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 hw/pci_internals.h diff --git a/hw/pci.c b/hw/pci.c index a98d6f3..9c83d74 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -23,6 +23,7 @@ */ #include "hw.h" #include "pci.h" +#include "pci_internals.h" #include "monitor.h" #include "net.h" #include "sysemu.h" @@ -36,31 +37,10 @@ # define PCI_DPRINTF(format, ...) do { } while (0) #endif -struct PCIBus { - BusState qbus; - int devfn_min; - pci_set_irq_fn set_irq; - pci_map_irq_fn map_irq; - pci_hotplug_fn hotplug; - DeviceState *hotplug_qdev; - void *irq_opaque; - PCIDevice *devices[256]; - PCIDevice *parent_dev; - target_phys_addr_t mem_base; - - QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */ - QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */ - - /* The bus IRQ state is the logical OR of the connected devices. - Keep a count of the number of devices with raised IRQs. */ - int nirq; - int *irq_count; -}; - static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); -static struct BusInfo pci_bus_info = { +struct BusInfo pci_bus_info = { .name = "PCI", .size = sizeof(PCIBus), .print_dev = pcibus_dev_print, @@ -1533,14 +1513,6 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, return res; } -typedef struct { - PCIDevice dev; - PCIBus bus; - uint32_t vid; - uint32_t did; -} PCIBridge; - - static void pci_bridge_update_mappings_fn(PCIBus *b, PCIDevice *d) { pci_update_mappings(d); diff --git a/hw/pci_internals.h b/hw/pci_internals.h new file mode 100644 index 0000000..8a3026b --- /dev/null +++ b/hw/pci_internals.h @@ -0,0 +1,40 @@ +#ifndef QEMU_PCI_INTERNALS_H +#define QEMU_PCI_INTERNALS_H + +/* + * This header files is private to pci.c and pci_bridge.c + * So following structures are opaque to others and shouldn't be + * accessed. + */ + +extern struct BusInfo pci_bus_info; + +struct PCIBus { + BusState qbus; + int devfn_min; + pci_set_irq_fn set_irq; + pci_map_irq_fn map_irq; + pci_hotplug_fn hotplug; + DeviceState *hotplug_qdev; + void *irq_opaque; + PCIDevice *devices[256]; + PCIDevice *parent_dev; + target_phys_addr_t mem_base; + + QLIST_HEAD(, PCIBus) child; /* this will be replaced by qdev later */ + QLIST_ENTRY(PCIBus) sibling;/* this will be replaced by qdev later */ + + /* The bus IRQ state is the logical OR of the connected devices. + Keep a count of the number of devices with raised IRQs. */ + int nirq; + int *irq_count; +}; + +typedef struct { + PCIDevice dev; + PCIBus bus; + uint32_t vid; + uint32_t did; +} PCIBridge; + +#endif /* QEMU_PCI_INTERNALS_H */