diff options
| author | Anthony Liguori | 2009-12-01 18:54:39 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2009-12-01 18:54:39 +0100 |
| commit | 365369847f2827b14b96c52d0fbaf9cce404e68a (patch) | |
| tree | 1ee8e1be27e3223b310bbb3d91bf2e54435280b0 /hw/ppc4xx_pci.c | |
| parent | tcg: increase TCG_MAX_OP_SIZE to 192 (diff) | |
| parent | msix: clear pending bit of an unused vector (diff) | |
| download | qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.gz qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.tar.xz qemu-365369847f2827b14b96c52d0fbaf9cce404e68a.zip | |
Merge commit 'mst/for_anthony' into mst
Diffstat (limited to 'hw/ppc4xx_pci.c')
| -rw-r--r-- | hw/ppc4xx_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 3aa7489e28..2d00b61228 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -378,7 +378,7 @@ PCIBus *ppc4xx_pci_init(CPUState *env, qemu_irq pci_irqs[4], cpu_register_physical_memory(config_space + PCIC0_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(config_space + PCIC0_CFGDATA, 4, index); |