summary refs log tree commit diff stats
path: root/hw
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-04 17:42:23 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:44 +0200
commitcd79664f76cd3ddabef92f99eef82db376ab137d (patch)
treeef9fd7f278f93f185812d179c0326889773e0a2f /hw
parent72c33dd7144ed5967db7969683454a5cb230f5f9 (diff)
downloadfocaccia-qemu-cd79664f76cd3ddabef92f99eef82db376ab137d.tar.gz
focaccia-qemu-cd79664f76cd3ddabef92f99eef82db376ab137d.zip
ppc_oldworld: Pass PowerPCCPU to ppc_heathrow_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')
-rw-r--r--hw/ppc_oldworld.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index ba8f3ada9b..f2c6908534 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -67,9 +67,9 @@ static target_phys_addr_t round_page(target_phys_addr_t addr)
 
 static void ppc_heathrow_reset(void *opaque)
 {
-    CPUPPCState *env = opaque;
+    PowerPCCPU *cpu = opaque;
 
-    cpu_state_reset(env);
+    cpu_reset(CPU(cpu));
 }
 
 static void ppc_heathrow_init (ram_addr_t ram_size,
@@ -114,7 +114,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
 
         /* Set time-base frequency to 16.6 Mhz */
         cpu_ppc_tb_init(env,  16600000UL);
-        qemu_register_reset(ppc_heathrow_reset, env);
+        qemu_register_reset(ppc_heathrow_reset, cpu);
     }
 
     /* allocate RAM */