diff options
| author | Anthony Liguori | 2011-08-25 14:48:24 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-25 14:48:24 +0200 |
| commit | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (patch) | |
| tree | fe43017f2bf431bc55a90b28e6c0e9357c4d46bd /hw/pci_host.h | |
| parent | Merge remote-tracking branch 'aneesh/for-upstream-2' into staging (diff) | |
| parent | milkymist: convert to memory API (diff) | |
| download | qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.gz qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.tar.xz qemu-8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging
Diffstat (limited to 'hw/pci_host.h')
| -rw-r--r-- | hw/pci_host.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/hw/pci_host.h b/hw/pci_host.h index 7f551143bb..0211086d70 100644 --- a/hw/pci_host.h +++ b/hw/pci_host.h @@ -29,12 +29,11 @@ #define PCI_HOST_H #include "sysbus.h" -#include "rwhandler.h" struct PCIHostState { SysBusDevice busdev; - ReadWriteHandler conf_handler; - ReadWriteHandler data_handler; + MemoryRegion conf_mem; + MemoryRegion data_mem; MemoryRegion *address_space; uint32_t config_reg; PCIBus *bus; @@ -49,12 +48,9 @@ uint32_t pci_host_config_read_common(PCIDevice *pci_dev, uint32_t addr, 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_conf_register_mmio(PCIHostState *s, int endian); -int pci_host_data_register_mmio(PCIHostState *s, int endian); - -/* for ioio */ -void pci_host_conf_register_ioport(pio_addr_t ioport, PCIHostState *s); -void pci_host_data_register_ioport(pio_addr_t ioport, PCIHostState *s); +extern const MemoryRegionOps pci_host_conf_le_ops; +extern const MemoryRegionOps pci_host_conf_be_ops; +extern const MemoryRegionOps pci_host_data_le_ops; +extern const MemoryRegionOps pci_host_data_be_ops; #endif /* PCI_HOST_H */ |