aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_newworld.c
diff options
context:
space:
mode:
authorAndreas Färber <andreas.faerber@web.de>2009-12-20 00:22:26 +0100
committerAurelien Jarno <aurelien@aurel32.net>2009-12-21 10:04:30 +0100
commit46214a27851095d6581a7c7f0efc4f592d264957 (patch)
tree757586a7c7b7845fc12bb0f33e6cacc1616d27fe /hw/ppc_newworld.c
parent9706c06d9c93b6d94785b6b14565b61ddae95a04 (diff)
ppc64: Change default machine to mac99
Also change the New World default CPU to 970FX for ppc64, since the G4 is a 32-bit CPU. Signed-off-by: Andreas Färber <andreas.faerber@web.de> Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw/ppc_newworld.c')
-rw-r--r--hw/ppc_newworld.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index a09f096ba3..a4c714ae7f 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -119,7 +119,11 @@ static void ppc_core99_init (ram_addr_t ram_size,
/* init CPUs */
if (cpu_model == NULL)
+#ifdef TARGET_PPC64
+ cpu_model = "970fx";
+#else
cpu_model = "G4";
+#endif
for (i = 0; i < smp_cpus; i++) {
env = cpu_init(cpu_model);
if (!env) {
@@ -385,6 +389,9 @@ static QEMUMachine core99_machine = {
.desc = "Mac99 based PowerMAC",
.init = ppc_core99_init,
.max_cpus = MAX_CPUS,
+#ifdef TARGET_PPC64
+ .is_default = 1,
+#endif
};
static void core99_machine_init(void)