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/dec_pci.c | |
| 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/dec_pci.c')
| -rw-r--r-- | hw/dec_pci.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/hw/dec_pci.c b/hw/dec_pci.c index a35f382052..1aec06611c 100644 --- a/hw/dec_pci.c +++ b/hw/dec_pci.c @@ -80,16 +80,15 @@ PCIBus *pci_dec_21154_init(PCIBus *parent_bus, int devfn) static int pci_dec_21154_init_device(SysBusDevice *dev) { DECState *s; - int pci_mem_config, pci_mem_data; s = FROM_SYSBUS(DECState, dev); - pci_mem_config = pci_host_conf_register_mmio(&s->host_state, - DEVICE_LITTLE_ENDIAN); - pci_mem_data = pci_host_data_register_mmio(&s->host_state, - DEVICE_LITTLE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, pci_mem_config); - sysbus_init_mmio(dev, 0x1000, pci_mem_data); + memory_region_init_io(&s->host_state.conf_mem, &pci_host_conf_le_ops, + &s->host_state, "pci-conf-idx", 0x1000); + memory_region_init_io(&s->host_state.data_mem, &pci_host_data_le_ops, + &s->host_state, "pci-data-idx", 0x1000); + sysbus_init_mmio_region(dev, &s->host_state.conf_mem); + sysbus_init_mmio_region(dev, &s->host_state.data_mem); return 0; } |