aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 17:22:20 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:44 +0200
commit90cb09d9d3c2fffc5722d091c059702e2cd089f5 (patch)
tree3e0977142fa952c1757d56d6578f835d94ba0ff5
parent572747136d20bc7e5e2c5a7c54af4aa44b6f42e2 (diff)
ppc4xx_devs: Pass PowerPCCPU to ppc4xx_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>
-rw-r--r--hw/ppc4xx_devs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 4cefd7514b..41163e607d 100644
--- a/hw/ppc4xx_devs.c
+++ b/hw/ppc4xx_devs.c
@@ -40,9 +40,9 @@
static void ppc4xx_reset(void *opaque)
{
- CPUPPCState *env = opaque;
+ PowerPCCPU *cpu = opaque;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
}
/*****************************************************************************/
@@ -70,7 +70,7 @@ CPUPPCState *ppc4xx_init (const char *cpu_model,
tb_clk->opaque = env;
ppc_dcr_init(env, NULL, NULL);
/* Register qemu callbacks */
- qemu_register_reset(ppc4xx_reset, env);
+ qemu_register_reset(ppc4xx_reset, cpu);
return env;
}