| Message ID | 1258005528-25383-14-git-send-email-yamahata@valinux.co.jp |
|---|---|
| State | New |
| Headers | show |
On Thu, Nov 12, 2009 at 02:58:41PM +0900, Isaku Yamahata wrote: > 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> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > hw/pci_host.h | 4 ++-- > hw/pcie_host.h | 4 ++-- > qemu-common.h | 2 ++ > 3 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/pci_host.h b/hw/pci_host.h > index cf3a339..a006687 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 a7771c9..7754ac9 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 b779cfe..8ecac61 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; > -- > 1.6.0.2
diff --git a/hw/pci_host.h b/hw/pci_host.h index cf3a339..a006687 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 a7771c9..7754ac9 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 b779cfe..8ecac61 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;
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> --- hw/pci_host.h | 4 ++-- hw/pcie_host.h | 4 ++-- qemu-common.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-)