From: Andreas Färber <afaerber@suse.de>
Date: Fri, 4 May 2012 17:14:38 +0000 (+0200)
Subject: target-arm: Use cpu_reset() in cpu_arm_init()
X-Git-Tag: v1.2.0-rc0~315^2~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df90dadb4507afa31fdc85f94d8571e7aa25b80b;p=thirdparty%2Fqemu.git

target-arm: Use cpu_reset() in cpu_arm_init()

Commit 3c30dd5a68e9fee6af67cfd0d14ed7520820f36a (target-arm: Move reset
handling to arm_cpu_reset) QOM'ified CPU reset. Complete it by replacing
cpu_state_reset() with cpu_reset().

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 7e1c2c06bd9..06ebffcf53c 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -80,7 +80,7 @@ ARMCPU *cpu_arm_init(const char *cpu_model)
         arm_translate_init();
     }
 
-    cpu_state_reset(env);
+    cpu_reset(CPU(cpu));
     if (arm_feature(env, ARM_FEATURE_NEON)) {
         gdb_register_coprocessor(env, vfp_gdb_get_reg, vfp_gdb_set_reg,
                                  51, "arm-neon.xml", 0);