diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-04 16:39:39 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-04 23:00:44 +0200 |
| commit | 182fbbf218aab161051c3fbe9d27a9fa45d24064 (patch) | |
| tree | 214282b9f0f8bd6ffaa548e1dbdd6547b930aa9a /hw/ppc440_bamboo.c | |
| parent | 322164e0dba9eeb1264a923c9bfafd7663fba8aa (diff) | |
| download | qemu-182fbbf218aab161051c3fbe9d27a9fa45d24064.zip qemu-182fbbf218aab161051c3fbe9d27a9fa45d24064.tar.gz qemu-182fbbf218aab161051c3fbe9d27a9fa45d24064.tar.bz2 | |
ppc440_bamboo: Pass PowerPCCPU to main_cpu_reset()
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>
Diffstat (limited to 'hw/ppc440_bamboo.c')
| -rw-r--r-- | hw/ppc440_bamboo.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c index 1a4e66a..0dd4dab 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc440_bamboo.c @@ -145,9 +145,10 @@ static void mmubooke_create_initial_mapping(CPUPPCState *env, 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[3] = FDT_ADDR; env->nip = entry; @@ -193,7 +194,7 @@ static void bamboo_init(ram_addr_t ram_size, } 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_dcr_init(env, NULL, NULL); |