summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-05 14:47:34 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-04 23:00:45 +0200
commitff18b7625f5f36ac19b69ed5f0f946093a407174 (patch)
treed7df2277e379adec891369824be6621294eecd9b
parentfdcb4fb6854e958b633dd8806e4ee1b6e7cea36f (diff)
downloadqemu-ff18b7625f5f36ac19b69ed5f0f946093a407174.tar.gz
qemu-ff18b7625f5f36ac19b69ed5f0f946093a407174.tar.bz2
qemu-ff18b7625f5f36ac19b69ed5f0f946093a407174.zip
linux-user: Use cpu_reset() after cpu_init() / cpu_copy()
Eliminates cpu_state_reset() usage. Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--linux-user/main.c2
-rw-r--r--linux-user/syscall.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 191b75060d..49108b81d3 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 20d2a74877..539af3f94b 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);