From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8Z55-0001MN-Vd for qemu-devel@nongnu.org; Thu, 12 Nov 2009 07:47:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8Z4y-0001KA-EB for qemu-devel@nongnu.org; Thu, 12 Nov 2009 07:47:17 -0500 Received: from [199.232.76.173] (port=37940 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8Z4y-0001K2-4x for qemu-devel@nongnu.org; Thu, 12 Nov 2009 07:47:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50735) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8Z4x-00085R-J9 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 07:47:11 -0500 Date: Thu, 12 Nov 2009 14:44:38 +0200 From: "Michael S. Tsirkin" Message-ID: <20091112124438.GA11123@redhat.com> References: <1258005528-25383-1-git-send-email-yamahata@valinux.co.jp> <1258005528-25383-3-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-3-git-send-email-yamahata@valinux.co.jp> Subject: [Qemu-devel] Re: [PATCH 02/20] pci: move pci_data_{read, write}() declaration from pci.h to pci_host.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:30PM +0900, Isaku Yamahata wrote: > Now pci host stuff has been moved from pci.[hc] to pci_host.[hc] > so the declaration of pci_data_{read, write}() should be in > pci_host.h > This patch moves them from pci.h to pci_host.h for consistency. > > Signed-off-by: Isaku Yamahata > --- > hw/pci.h | 2 -- > hw/pci_host.h | 3 +++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/pci.h b/hw/pci.h > index 9a56d0d..d3378d3 100644 > --- a/hw/pci.h > +++ b/hw/pci.h > @@ -293,8 +293,6 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, > const char *default_devaddr); > PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, > const char *default_devaddr); > -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); > int pci_bus_num(PCIBus *s); > void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d)); > PCIBus *pci_find_host_bus(int domain); > diff --git a/hw/pci_host.h b/hw/pci_host.h > index e5e877f..7cfa693 100644 > --- a/hw/pci_host.h > +++ b/hw/pci_host.h > @@ -36,6 +36,9 @@ typedef struct { > 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); > + > /* for mmio */ > int pci_host_config_register_io_memory(PCIHostState *s); > int pci_host_config_register_io_memory_noswap(PCIHostState *s); > -- > 1.6.0.2 This breaks arm build (versatile_pci), ppc build (sh_pci). I added #include "pci_host.h" there as well. We end up with the following (this is on top of my cleanup patches): ---> From: Isaku Yamahata Subject: pci: move pci_data_{read, write}() declaration from pci.h to pci_host.h Now pci host stuff has been moved from pci.[hc] to pci_host.[hc] so the declaration of pci_data_{read, write}() should be in pci_host.h This patch moves them from pci.h to pci_host.h for consistency. Signed-off-by: Isaku Yamahata Acked-by: Michael S. Tsirkin --- diff --git a/hw/pci.h b/hw/pci.h index c649cfe..686221b 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -293,8 +293,6 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, const char *default_devaddr); PCIDevice *pci_nic_init_nofail(NICInfo *nd, const char *default_model, const char *default_devaddr); -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); int pci_bus_num(PCIBus *s); void pci_for_each_device(PCIBus *bus, int bus_num, void (*fn)(PCIBus *bus, PCIDevice *d)); PCIBus *pci_find_host_bus(int domain); diff --git a/hw/pci_host.h b/hw/pci_host.h index e5e877f..7cfa693 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -36,6 +36,9 @@ typedef struct { 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); + /* for mmio */ int pci_host_config_register_io_memory(PCIHostState *s); int pci_host_config_register_io_memory_noswap(PCIHostState *s); diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 52dc02e..abe4c75 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -24,6 +24,7 @@ #include "hw.h" #include "sh.h" #include "pci.h" +#include "pci_host.h" #include "sh_pci.h" #include "bswap.h" diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c index a0d7d07..153c651 100644 --- a/hw/versatile_pci.c +++ b/hw/versatile_pci.c @@ -9,6 +9,7 @@ #include "sysbus.h" #include "pci.h" +#include "pci_host.h" typedef struct { SysBusDevice busdev;