ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Färber 2009-12-20 00:22:26 +01:00 committed by Aurelien Jarno
parent 9706c06d9c
commit 46214a2785
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc_newworld.c
View File

@ -119,7 +119,11 @@ static void ppc_core99_init (ram_addr_t ram_size,
/* init CPUs */ /* init CPUs */
if (cpu_model == NULL) if (cpu_model == NULL)
#ifdef TARGET_PPC64
cpu_model = "970fx";
#else
cpu_model = "G4"; cpu_model = "G4";
#endif
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
env = cpu_init(cpu_model); env = cpu_init(cpu_model);
if (!env) { if (!env) {
@ -385,6 +389,9 @@ static QEMUMachine core99_machine = {
.desc = "Mac99 based PowerMAC", .desc = "Mac99 based PowerMAC",
.init = ppc_core99_init, .init = ppc_core99_init,
.max_cpus = MAX_CPUS, .max_cpus = MAX_CPUS,
#ifdef TARGET_PPC64
.is_default = 1,
#endif
}; };
static void core99_machine_init(void) static void core99_machine_init(void)

2
hw/ppc_oldworld.c
View File

@ -409,7 +409,9 @@ static QEMUMachine heathrow_machine = {
.desc = "Heathrow based PowerMAC", .desc = "Heathrow based PowerMAC",
.init = ppc_heathrow_init, .init = ppc_heathrow_init,
.max_cpus = MAX_CPUS, .max_cpus = MAX_CPUS,
#ifndef TARGET_PPC64
.is_default = 1, .is_default = 1,
#endif
}; };
static void heathrow_machine_init(void) static void heathrow_machine_init(void)