[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for master 1/3] pci: move out pci internal structure
From: |
Isaku Yamahata |
Subject: |
[Qemu-devel] [PATCH for master 1/3] pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info. |
Date: |
Tue, 27 Jul 2010 15:23:22 +0900 |
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 <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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 */
--
1.7.1.1
- [Qemu-devel] [PATCH 0/3] pci, pcihost: pci host bus clean up, Isaku Yamahata, 2010/07/26
- [Qemu-devel] [PATCH 2/3] pci/pci_host: pci host bus initialization clean up., Isaku Yamahata, 2010/07/26
- Re: [Qemu-devel] [PATCH 0/3] pci, pcihost: pci host bus clean up, Aurelien Jarno, 2010/07/26
- Re: [Qemu-devel] [PATCH 0/3] pci, pcihost: pci host bus clean up, Isaku Yamahata, 2010/07/27
- [Qemu-devel] [PATCH for master 0/3] pci, pcihost: pci host bus clean up, Isaku Yamahata, 2010/07/27
- [Qemu-devel] [PATCH for master 2/3] pci_host: remove PCIHostState::busdev., Isaku Yamahata, 2010/07/27
- [Qemu-devel] [PATCH for master 1/3] pci: move out pci internal structures, PCIBus, PCIBridge, and pci_bus_info.,
Isaku Yamahata <=
- [Qemu-devel] [PATCH for master 3/3] pci/pci_host: pci host bus initialization clean up., Isaku Yamahata, 2010/07/27
- Re: [Qemu-devel] [PATCH for master 0/3] pci, pcihost: pci host bus clean up, Aurelien Jarno, 2010/07/30