From: Andreas Färber <afaerber@suse.de>
Date: Sat, 5 May 2012 12:47:34 +0000 (+0200)
Subject: linux-user: Use cpu_reset() after cpu_init() / cpu_copy()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ff18b7625f5f36ac19b69ed5f0f946093a407174;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

linux-user: Use cpu_reset() after cpu_init() / cpu_copy()

Eliminates cpu_state_reset() usage.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/linux-user/main.c b/linux-user/main.c
index 191b75060..49108b81d 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3405,7 +3405,7 @@ int main(int argc, char **argv, char **envp)
         exit(1);
     }
 #if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
-    cpu_state_reset(env);
+    cpu_reset(ENV_GET_CPU(env));
 #endif
 
     thread_env = env;
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 20d2a7487..539af3f94 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4262,7 +4262,7 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp,
         /* we create a new CPU instance. */
         new_env = cpu_copy(env);
 #if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC)
-        cpu_state_reset(new_env);
+        cpu_reset(ENV_GET_CPU(new_env));
 #endif
         /* Init regs that differ from the parent.  */
         cpu_clone_regs(new_env, newsp);