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/grackle_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/grackle_pci.c')
| -rw-r--r-- | hw/grackle_pci.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/grackle_pci.c b/hw/grackle_pci.c index f3a8a7da12..089d1fba01 100644 --- a/hw/grackle_pci.c +++ b/hw/grackle_pci.c @@ -108,8 +108,8 @@ static int pci_grackle_init_device(SysBusDevice *dev) s = FROM_SYSBUS(GrackleState, dev); - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); @@ -126,8 +126,8 @@ static int pci_dec_21154_init_device(SysBusDevice *dev) s = FROM_SYSBUS(GrackleState, dev); - pci_mem_config = pci_host_config_register_io_memory(&s->host_state); - pci_mem_data = pci_host_data_register_io_memory(&s->host_state); + pci_mem_config = pci_host_conf_register_mmio(&s->host_state); + pci_mem_data = pci_host_data_register_mmio(&s->host_state); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); return 0; |