diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-11-12 14:58:41 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2009-12-01 17:52:08 +0200 |
| commit | fb47a2e983f3e0b4c9d36fe0d31ed8a1224e767b (patch) | |
| tree | 125bbb7c1c28c18e0708a75d90ede631345503ae | |
| parent | 3c217c14f58c0146a0dbca01716cd850a63a0e81 (diff) | |
pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h.
This patch moves two typedefs, PCIHostState and PCIExpressHost to
qemu-common.h for consistency as PCIBus and PCIDevice are typedefed
in qemu-common.h.
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci_host.h | 4 | ||||
| -rw-r--r-- | hw/pcie_host.h | 4 | ||||
| -rw-r--r-- | qemu-common.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/hw/pci_host.h b/hw/pci_host.h index cf3a3393d9..a006687f8b 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -30,11 +30,11 @@ #include "sysbus.h" -typedef struct { +struct PCIHostState { SysBusDevice busdev; uint32_t config_reg; PCIBus *bus; -} PCIHostState; +}; void pci_data_write(PCIBus *s, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(PCIBus *s, uint32_t addr, int len); diff --git a/hw/pcie_host.h b/hw/pcie_host.h index a7771c912a..7754ac94e8 100644 --- a/hw/pcie_host.h +++ b/hw/pcie_host.h @@ -24,7 +24,7 @@ #include "pci_host.h" -typedef struct { +struct PCIExpressHost { PCIHostState pci; /* express part */ @@ -37,7 +37,7 @@ typedef struct { /* result of cpu_register_io_memory() to map MMCONFIG area */ int mmio_index; -} PCIExpressHost; +}; int pcie_host_init(PCIExpressHost *e); void pcie_host_mmcfg_unmap(PCIExpressHost *e); diff --git a/qemu-common.h b/qemu-common.h index b1e038bd00..57af677f07 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -198,6 +198,8 @@ typedef struct i2c_bus i2c_bus; typedef struct i2c_slave i2c_slave; typedef struct SMBusDevice SMBusDevice; typedef struct QEMUTimer QEMUTimer; +typedef struct PCIHostState PCIHostState; +typedef struct PCIExpressHost PCIExpressHost; typedef struct PCIBus PCIBus; typedef struct PCIDevice PCIDevice; typedef struct SerialState SerialState; |