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 <yamahata@valinux.co.jp>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/hw/pci.h b/hw/pci.h
index 560da5074e7bdecfa9e4da9fa27f44ede6dc61b4..2f213524c528010db6646ae9a71b58aa1cb61e5b 100644 (file)
--- 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 e5e877f4cd63e119e73f83784387c87330724da5..7cfa693563676b46b6c9aeaec7b40ce5861ba245 100644 (file)
--- 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 52dc02e1e798d0a482cefbd659d0a67f8c44e29a..abe4c7568b05ca4bceb5f429b2af04c8a456e7fe 100644 (file)
--- 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 a0d7d07ad2fd52d6a3255caa5f9c0d2ee4d08fe6..153c6514f774da73d509da5f61108bcb1311bf0c 100644 (file)
--- 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;