mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-12-17 21:26:13 -07:00
Revert "Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging"
This reverts commit8ef9ea85a2, reversing changes made to444dc48298. From Avi: Please revert the entire pull (git revert8ef9ea85a2) while I work this out - it isn't trivial. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
f065aa0a00
commit
01e0451a08
49 changed files with 657 additions and 637 deletions
|
|
@ -125,15 +125,9 @@ PCIBus *pci_prep_init(qemu_irq *pic,
|
|||
address_space_io,
|
||||
0, 4);
|
||||
|
||||
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);
|
||||
pci_host_conf_register_ioport(0xcf8, s);
|
||||
|
||||
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);
|
||||
pci_host_data_register_ioport(0xcfc, s);
|
||||
|
||||
PPC_io_memory = cpu_register_io_memory(PPC_PCIIO_read,
|
||||
PPC_PCIIO_write, s,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue