From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8X2B-0008BM-1x for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:36:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8X25-00089C-AR for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:36:09 -0500 Received: from [199.232.76.173] (port=56021 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8X25-00088x-3M for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:36:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5397) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8X24-00037C-M8 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:36:04 -0500 Date: Thu, 12 Nov 2009 12:33:32 +0200 From: "Michael S. Tsirkin" Message-ID: <20091112103332.GH3785@redhat.com> References: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> <1258005528-25383-14-git-send-email-yamahata@valinux.co.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1258005528-25383-14-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 13/20] pci: move typedef, PCIHostState, PCIExpressHost to qemu-common.h. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Isaku Yamahata Cc: qemu-devel@nongnu.org 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 Acked-by: Michael S. Tsirkin > --- > 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