diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:47 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-26 08:00:47 -0500 |
| commit | 3b7653ac48e6d1edfa4ae2496dbefbe422a94eb6 (patch) | |
| tree | 4b23f168b04d02da2444d2bc85ed8b5b3b497ce1 /hw | |
| parent | 4c54661feb0437eab99186a0e462524e18592b9c (diff) | |
| parent | 12da94ff8f847d9e7f13f3cf247d37f3f9dbe1f6 (diff) | |
| download | hqemu-3b7653ac48e6d1edfa4ae2496dbefbe422a94eb6.zip hqemu-3b7653ac48e6d1edfa4ae2496dbefbe422a94eb6.tar.gz | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/urgent' into staging
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/prep_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/prep_pci.c b/hw/prep_pci.c index 55e4e25..149807a 100644 --- a/hw/prep_pci.c +++ b/hw/prep_pci.c @@ -130,7 +130,7 @@ PCIBus *pci_prep_init(qemu_irq *pic, memory_region_add_subregion(address_space_io, 0xcf8, &s->conf_mem); sysbus_init_ioports(&s->busdev, 0xcf8, 1); - memory_region_init_io(&s->conf_mem, &pci_host_data_be_ops, s, + memory_region_init_io(&s->data_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); |
