diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-01 11:54:39 -0600 |
| commit | 365369847f2827b14b96c52d0fbaf9cce404e68a (patch) | |
| tree | 1ee8e1be27e3223b310bbb3d91bf2e54435280b0 /hw/ppce500_pci.c | |
| parent | 0cbfcd2b03bd602b7c65f73267bf84d4f7e9fe8d (diff) | |
| parent | 98304c846d8866dae6322ef400ce6595b23cfc41 (diff) | |
| download | focaccia-qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.gz focaccia-qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.zip | |
Merge commit 'mst/for_anthony' into mst
Diffstat (limited to 'hw/ppce500_pci.c')
| -rw-r--r-- | hw/ppce500_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ppce500_pci.c b/hw/ppce500_pci.c index 223de3ae34..a72fb86d2e 100644 --- a/hw/ppce500_pci.c +++ b/hw/ppce500_pci.c @@ -293,13 +293,13 @@ PCIBus *ppce500_pci_init(qemu_irq pci_irqs[4], target_phys_addr_t registers) controller->pci_dev = d; /* CFGADDR */ - index = pci_host_config_register_io_memory_noswap(&controller->pci_state); + index = pci_host_conf_register_mmio_noswap(&controller->pci_state); if (index < 0) goto free; cpu_register_physical_memory(registers + PCIE500_CFGADDR, 4, index); /* CFGDATA */ - index = pci_host_data_register_io_memory(&controller->pci_state); + index = pci_host_data_register_mmio(&controller->pci_state); if (index < 0) goto free; cpu_register_physical_memory(registers + PCIE500_CFGDATA, 4, index); |