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.faer...@web.de>
Cc: Alexander Graf <ag...@suse.de>
---
hw/ppc_newworld.c | 7 +++++++
hw/ppc_oldworld.c | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index a09f096..a4c714a 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)
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index c90b151..7ccc6a1 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -409,7 +409,9 @@ static QEMUMachine heathrow_machine = {
.desc = "Heathrow based PowerMAC",
.init = ppc_heathrow_init,
.max_cpus = MAX_CPUS,
+#ifndef TARGET_PPC64
.is_default = 1,
+#endif
};
static void heathrow_machine_init(void)
--
1.6.5.2
