From: Andreas Färber <afaerber@suse.de>
Date: Fri, 4 May 2012 15:22:20 +0000 (+0200)
Subject: ppc4xx_devs: Pass PowerPCCPU to ppc4xx_reset()
X-Git-Tag: v1.2.0-rc0~315^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90cb09d9d3c2fffc5722d091c059702e2cd089f5;p=thirdparty%2Fqemu.git

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>
---

diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c
index 4cefd7514bd..41163e607de 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;
 }