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/prep_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/prep_pci.c')
| -rw-r--r-- | hw/prep_pci.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/hw/prep_pci.c b/hw/prep_pci.c index c36232a808..55e4e25099 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -125,9 +125,15 @@ PCIBus *pci_prep_init(qemu_irq *pic, address_space_io, 0, 4); - pci_host_conf_register_ioport(0xcf8, s); - - pci_host_data_register_ioport(0xcfc, s); + memory_region_init_io(&s->conf_mem, &pci_host_conf_be_ops, s, + "pci-conf-idx", 1); + memory_region_add_subregion(address_space_io, 0xcf8, &s->conf_mem); + sysbus_init_ioports(&s->busdev, 0xcf8, 1); + + memory_region_init_io(&s->conf_mem, &pci_host_data_be_ops, s, + "pci-conf-data", 1); + memory_region_add_subregion(address_space_io, 0xcfc, &s->data_mem); + sysbus_init_ioports(&s->busdev, 0xcfc, 1); PPC_io_memory = cpu_register_io_memory(PPC_PCIIO_read, PPC_PCIIO_write, s, |