From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8WnN-0006pa-W8 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:20:54 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8WnJ-0006kR-At for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:20:53 -0500 Received: from [199.232.76.173] (port=46313 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8WnJ-0006kJ-4F for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:20:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10103) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8WnI-0000lf-O9 for qemu-devel@nongnu.org; Thu, 12 Nov 2009 05:20:48 -0500 Date: Thu, 12 Nov 2009 12:18:15 +0200 From: "Michael S. Tsirkin" Message-ID: <20091112101815.GB3785@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 Acked-by: Michael S. Tsirkin > --- > 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