From: Paolo Bonzini Date: Fri, 28 Oct 2011 09:52:42 +0000 (+0100) Subject: Make cpu_single_env thread-local X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~17^2~1453 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3c4bbe56dc707102d3abd969f51bb2aa9c6c53d;p=sdk%2Femulator%2Fqemu.git Make cpu_single_env thread-local Make cpu_single_env thread-local. This fixes a regression in handling of multi-threaded programs in linux-user mode (bug 823902). Signed-off-by: Paolo Bonzini [Peter Maydell: rename tls_cpu_single_env to cpu_single_env] Signed-off-by: Peter Maydell Reviewed-by: Andreas Färber Signed-off-by: Anthony Liguori --- diff --git a/cpu-all.h b/cpu-all.h index 42a5fa0a7c..5f47ab8df9 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -20,6 +20,7 @@ #define CPU_ALL_H #include "qemu-common.h" +#include "qemu-tls.h" #include "cpu-common.h" /* some important defines: @@ -334,7 +335,8 @@ void cpu_dump_statistics(CPUState *env, FILE *f, fprintf_function cpu_fprintf, void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...) GCC_FMT_ATTR(2, 3); extern CPUState *first_cpu; -extern CPUState *cpu_single_env; +DECLARE_TLS(CPUState *,cpu_single_env); +#define cpu_single_env get_tls(cpu_single_env) /* Flags for use in ENV->INTERRUPT_PENDING. diff --git a/exec.c b/exec.c index 54ecbe7e36..6b92198e62 100644 --- a/exec.c +++ b/exec.c @@ -120,7 +120,7 @@ static MemoryRegion *system_io; CPUState *first_cpu; /* current CPU in the current thread. It is only valid inside cpu_exec() */ -CPUState *cpu_single_env; +DEFINE_TLS(CPUState *,cpu_single_env); /* 0 = Do not count executed instructions. 1 = Precise instruction counting. 2 = Adaptive rate instruction counting. */