commit a2247f8ec919c51c5749c2e3659841f1a733cce3
author Andreas Färber <afaerber@suse.de> Sun Jun 09 19:47:04 2013 +0200
committer Andreas Färber <afaerber@suse.de> Tue Jul 09 21:33:01 2013 +0200
tree aaadd0ec73949c9dd01af0233f863c3a7b91bb30
parent 182735efaf956ccab50b6d74a4fed163e0f35660

linux-user: Change thread_env to CPUState

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

linux-user/syscall.c

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 4c96f4f..433d3ba 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -4171,8 +4171,8 @@
 
     env = info->env;
     cpu = ENV_GET_CPU(env);
-    thread_env = env;
-    ts = (TaskState *)thread_env->opaque;
+    thread_cpu = cpu;
+    ts = (TaskState *)env->opaque;
     info->tid = gettid();
     cpu->host_tid = info->tid;
     task_settid(ts);
@@ -5079,7 +5079,7 @@
                 sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX,
                           NULL, NULL, 0);
             }
-            thread_env = NULL;
+            thread_cpu = NULL;
             object_unref(OBJECT(ENV_GET_CPU(cpu_env)));
             g_free(ts);
             pthread_exit(NULL);