aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 17:46:13 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:44 +0200
commit5c3e735f9b46582828d5d0606174ab1f487da4d0 (patch)
tree48caaebb18f9fd6a1670ebb13778c20d001d166a
parenta9bf3df02114563902cd9aa585457f912434e3bc (diff)
ppc_prep: Pass PowerPCCPU to ppc_prep_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/ppc_prep.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 0b880a5c7c..be2b26830d 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -441,9 +441,9 @@ static void cpu_request_exit(void *opaque, int irq, int level)
static void ppc_prep_reset(void *opaque)
{
- CPUPPCState *env = opaque;
+ PowerPCCPU *cpu = opaque;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
}
/* PowerPC PREP hardware initialisation */
@@ -502,7 +502,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
/* Set time-base frequency to 100 Mhz */
cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
}
- qemu_register_reset(ppc_prep_reset, env);
+ qemu_register_reset(ppc_prep_reset, cpu);
}
/* allocate RAM */