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

ppc_newworld: Use cpu_ppc_init() to obtain PowerPCCPU 

Needed for ppc_core99_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2012-05-04 17:29:07 +02:00
parent 90cb09d9d3
commit 8f8204ecb7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc_newworld.c
View File

@ -136,6 +136,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
const char *initrd_filename, const char *initrd_filename,
const char *cpu_model) const char *cpu_model)
{ {
PowerPCCPU *cpu = NULL;
CPUPPCState *env = NULL; CPUPPCState *env = NULL;
char *filename; char *filename;
qemu_irq *pic, **openpic_irqs; qemu_irq *pic, **openpic_irqs;
@ -166,11 +167,13 @@ static void ppc_core99_init (ram_addr_t ram_size,
cpu_model = "G4"; cpu_model = "G4";
#endif #endif
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
env = cpu_init(cpu_model); cpu = cpu_ppc_init(cpu_model);
if (!env) { if (cpu == NULL) {
fprintf(stderr, "Unable to find PowerPC CPU definition\n"); fprintf(stderr, "Unable to find PowerPC CPU definition\n");
exit(1); exit(1);
} }
env = &cpu->env;
/* Set time-base frequency to 100 Mhz */ /* Set time-base frequency to 100 Mhz */
cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL); cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
qemu_register_reset(ppc_core99_reset, env); qemu_register_reset(ppc_core99_reset, env);