commit 9f09e18a6df39ab11cd80e203c5736af1823f3b3
author Andreas Färber <afaerber@suse.de> Thu May 03 06:59:07 2012 +0200
committer Andreas Färber <afaerber@suse.de> Wed Oct 31 04:12:23 2012 +0100
tree a068474121d1d07026de378123bae50bbd11cc01
parent f100f0b38fe43c683f437a8fa3e449d6752f6a58

cpu: Move thread_id to CPUState

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

exec.c

diff --git a/exec.c b/exec.c
index 038e40d..df67938 100644
--- a/exec.c
+++ b/exec.c
@@ -689,6 +689,9 @@
 
 void cpu_exec_init(CPUArchState *env)
 {
+#ifndef CONFIG_USER_ONLY
+    CPUState *cpu = ENV_GET_CPU(env);
+#endif
     CPUArchState **penv;
     int cpu_index;
 
@@ -707,7 +710,7 @@
     QTAILQ_INIT(&env->breakpoints);
     QTAILQ_INIT(&env->watchpoints);
 #ifndef CONFIG_USER_ONLY
-    env->thread_id = qemu_get_thread_id();
+    cpu->thread_id = qemu_get_thread_id();
 #endif
     *penv = env;
 #if defined(CONFIG_USER_ONLY)