commit b3c4bbe56dc707102d3abd969f51bb2aa9c6c53d
author Paolo Bonzini <pbonzini@redhat.com> Fri Oct 28 10:52:42 2011 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Tue Nov 01 10:58:08 2011 -0500
tree 4494108465a1d39a4421da8c945db566a6691089
parent 8a5f7b03a0a711ec8e04aeebe339cdb8b876794b

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 <pbonzini@redhat.com>
[Peter Maydell: rename tls_cpu_single_env to cpu_single_env]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

exec.c

diff --git a/exec.c b/exec.c
index 54ecbe7..6b92198 100644
--- a/exec.c
+++ b/exec.c
@@ -120,7 +120,7 @@
 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.  */