diff options
| author | Alexander Graf <agraf@suse.de> | 2013-07-06 14:17:51 +0200 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-07-23 17:28:28 +0300 |
| commit | b24c882b9435d0745679a96571027a2c92065e4f (patch) | |
| tree | a744621bb3a3d8c90ab886dca6d35cd017e2e91f | |
| parent | ddaa7e5a2ad0ef20fd3d1cc44a9ade75e5eabcfc (diff) | |
| download | qemu-b24c882b9435d0745679a96571027a2c92065e4f.tar.gz qemu-b24c882b9435d0745679a96571027a2c92065e4f.tar.bz2 qemu-b24c882b9435d0745679a96571027a2c92065e4f.zip | |
linux-user: Reset copied CPUs in cpu_copy() always
When a new thread gets created, we need to reset non arch specific state to
get the new CPU into clean state.
However this reset should happen before the arch specific CPU contents get
copied over. Otherwise we end up having clean reset state in our newly created
thread.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rw-r--r-- | exec.c | 4 | ||||
| -rw-r--r-- | linux-user/syscall.c | 3 |
2 files changed, 4 insertions, 3 deletions
@@ -642,6 +642,10 @@ CPUArchState *cpu_copy(CPUArchState *env) CPUWatchpoint *wp; #endif + /* Reset non arch specific state */ + cpu_reset(ENV_GET_CPU(new_env)); + + /* Copy arch specific state into the new CPU */ memcpy(new_env, env, sizeof(CPUArchState)); /* Clone all break/watchpoints. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a797afc340..3f6db4b0d1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4293,9 +4293,6 @@ static int do_fork(CPUArchState *env, unsigned int flags, abi_ulong newsp, init_task_state(ts); /* we create a new CPU instance. */ new_env = cpu_copy(env); -#if defined(TARGET_I386) || defined(TARGET_SPARC) || defined(TARGET_PPC) - cpu_reset(ENV_GET_CPU(new_env)); -#endif /* Init regs that differ from the parent. */ cpu_clone_regs(new_env, newsp); new_env->opaque = ts; |