diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2009-11-12 14:58:30 +0900 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2009-12-01 17:51:15 +0200 |
| commit | cee68d581ccdb4b2c1a737da1c5a34a76bac7c18 (patch) | |
| tree | 691078fec2aa9b81f7d2842f425234cba8ca07d1 /hw | |
| parent | b43c42e882e8d3a8127ab2f0a298a7b3d7fd5046 (diff) | |
| download | qemu-cee68d581ccdb4b2c1a737da1c5a34a76bac7c18.tar.gz qemu-cee68d581ccdb4b2c1a737da1c5a34a76bac7c18.tar.bz2 qemu-cee68d581ccdb4b2c1a737da1c5a34a76bac7c18.zip | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci.h | 2 | ||||
| -rw-r--r-- | hw/pci_host.h | 3 | ||||
| -rw-r--r-- | hw/sh_pci.c | 1 | ||||
| -rw-r--r-- | hw/versatile_pci.c | 1 |
4 files changed, 5 insertions, 2 deletions
@@ -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 e5e877f4cd..7cfa693563 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 52dc02e1e7..abe4c7568b 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 a0d7d07ad2..153c6514f7 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; |