diff options
| author | Avi Kivity <avi@redhat.com> | 2011-07-24 17:47:18 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-08-24 20:17:39 +0300 |
| commit | d2c33733c85c4df7cd0f5e0426a22e737d542516 (patch) | |
| tree | daa4228405f900b9189b946225b61e7346bb74a3 /hw/ppc4xx_pci.c | |
| parent | be35694da941168603b09a7420bcc476d745fc41 (diff) | |
pci_host: convert conf index and data ports to memory API
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/ppc4xx_pci.c')
| -rw-r--r-- | hw/ppc4xx_pci.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/hw/ppc4xx_pci.c b/hw/ppc4xx_pci.c index 52e2663a01..339b38ec7a 100644 --- a/hw/ppc4xx_pci.c +++ b/hw/ppc4xx_pci.c @@ -368,10 +368,12 @@ 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_mmio(&controller->pci_state, 1); - if (index < 0) - goto free; - cpu_register_physical_memory(config_space + PCIC0_CFGDATA, 4, index); + memory_region_init_io(&controller->pci_state.data_mem, + &pci_host_data_be_ops, + &controller->pci_state, "pci-conf-data", 4); + memory_region_add_subregion(get_system_memory(), + config_space + PCIC0_CFGDATA, + &controller->pci_state.data_mem); /* Internal registers */ index = cpu_register_io_memory(pci_reg_read, pci_reg_write, controller, |