aboutsummaryrefslogtreecommitdiff
path: root/hw/ppc_newworld.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 17:30:25 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:44 +0200
commit6680988c3037d88763ecbec3fecb4f8c0c4187d2 (patch)
tree3801c4fbc375221796b216aec77613a13c1bd739 /hw/ppc_newworld.c
parent8f8204ecb7514a384f9e3776b16ef274ddf1e221 (diff)
ppc_newworld: Pass PowerPCCPU to ppc_core99_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/ppc_newworld.c')
-rw-r--r--hw/ppc_newworld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index 6f7f1b5b6f..4e2a6e691b 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -123,9 +123,9 @@ static target_phys_addr_t round_page(target_phys_addr_t addr)
static void ppc_core99_reset(void *opaque)
{
- CPUPPCState *env = opaque;
+ PowerPCCPU *cpu = opaque;
- cpu_state_reset(env);
+ cpu_reset(CPU(cpu));
}
/* PowerPC Mac99 hardware initialisation */
@@ -176,7 +176,7 @@ static void ppc_core99_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_core99_reset, env);
+ qemu_register_reset(ppc_core99_reset, cpu);
}
/* allocate RAM */