summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2013-06-25 03:46:33 +0200
committerAlexander Graf <agraf@suse.de>2013-07-01 01:11:17 +0200
commit593c18116090237db96af6e50b902d790265ebc5 (patch)
tree0256a9a99f54b5285b4c7a4114ecc0d7cece7cb7
parent4e46dcdbd31314c66fc19f73d9358852f77e8e2e (diff)
downloadqemu-593c18116090237db96af6e50b902d790265ebc5.tar.gz
qemu-593c18116090237db96af6e50b902d790265ebc5.tar.bz2
qemu-593c18116090237db96af6e50b902d790265ebc5.zip
PPC: Newworld: Add second uninorth control register set
Mac OS X requires a second uninorth register set to be mapped a few bytes above the first one. Let's just expose it to make it happy. Signed-off-by: Alexander Graf <agraf@suse.de>
-rw-r--r--hw/ppc/mac_newworld.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 7b512cae19..3badfa3adb 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -152,6 +152,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
char *filename;
qemu_irq *pic, **openpic_irqs;
MemoryRegion *unin_memory = g_new(MemoryRegion, 1);
+ MemoryRegion *unin2_memory = g_new(MemoryRegion, 1);
int linux_boot, i, j, k;
MemoryRegion *ram = g_new(MemoryRegion, 1), *bios = g_new(MemoryRegion, 1);
hwaddr kernel_base, initrd_base, cmdline_base = 0;
@@ -292,6 +293,9 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
memory_region_init_io(unin_memory, &unin_ops, token, "unin", 0x1000);
memory_region_add_subregion(get_system_memory(), 0xf8000000, unin_memory);
+ memory_region_init_io(unin2_memory, &unin_ops, token, "unin", 0x1000);
+ memory_region_add_subregion(get_system_memory(), 0xf3000000, unin2_memory);
+
openpic_irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *));
openpic_irqs[0] =
g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB);