summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity2011-08-28 17:17:04 +0200
committerAvi Kivity2011-08-28 17:34:39 +0200
commit73c92f9aecc099aa81ee05a2bdb30bb43184cc28 (patch)
tree18a15e20635b0f0dfe7e4d832d397b08d755f1e2
parentMerge remote-tracking branch 'stefanha/trivial-patches' into staging (diff)
downloadqemu-73c92f9aecc099aa81ee05a2bdb30bb43184cc28.tar.gz
qemu-73c92f9aecc099aa81ee05a2bdb30bb43184cc28.tar.xz
qemu-73c92f9aecc099aa81ee05a2bdb30bb43184cc28.zip
sh_pci: Fix sh_pci memory alias confusion
The a7 area was set up as an alias of itself, rather than the p4 area. This sent the memory core into infinite recursion. Fix by aliasing the a7 area to the p4 area. Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--hw/sh_pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sh_pci.c b/hw/sh_pci.c
index 76061bb756..36f39300d5 100644
--- a/hw/sh_pci.c
+++ b/hw/sh_pci.c
@@ -150,7 +150,7 @@ static int sh_pci_init_device(SysBusDevice *dev)
PCI_DEVFN(0, 0), 4);
memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s,
"sh_pci", 0x224);
- memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7,
+ memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_p4,
0, 0x224);
isa_mmio_setup(&s->isa, 0x40000);
sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap);