david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset()

Browse Source 
Allows us to use cpu_reset() in place of cpu_state_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 16:39:39 +02:00
parent 322164e0db
commit 182fbbf218
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc440_bamboo.c
View File

@ -145,9 +145,10 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env,
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
CPUPPCState *env = opaque; PowerPCCPU *cpu = opaque;
CPUPPCState *env = &cpu->env;
cpu_state_reset(env); cpu_reset(CPU(cpu));
env->gpr[1] = (16<<20) - 8; env->gpr[1] = (16<<20) - 8;
env->gpr[3] = FDT_ADDR; env->gpr[3] = FDT_ADDR;
env->nip = entry; env->nip = entry;
@ -193,7 +194,7 @@ static void bamboo_init(ram_addr_t ram_size,
} }
env = &cpu->env; env = &cpu->env;
qemu_register_reset(main_cpu_reset, env); qemu_register_reset(main_cpu_reset, cpu);
ppc_booke_timers_init(env, 400000000, 0); ppc_booke_timers_init(env, 400000000, 0);
ppc_dcr_init(env, NULL, NULL); ppc_dcr_init(env, NULL, NULL);