diff --git a/cpu-defs.h b/cpu-defs.h
index f49e9500a9..4018b88a1a 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -151,14 +151,6 @@ typedef struct CPUWatchpoint {
     QTAILQ_ENTRY(CPUWatchpoint) entry;
 } CPUWatchpoint;
 
-#ifdef _WIN32
-#define CPU_COMMON_THREAD \
-    void *hThread;
-
-#else
-#define CPU_COMMON_THREAD
-#endif
-
 #define CPU_TEMP_BUF_NLONGS 128
 #define CPU_COMMON                                                      \
     struct TranslationBlock *current_tb; /* currently executing TB  */  \
@@ -216,10 +208,7 @@ typedef struct CPUWatchpoint {
     uint32_t created;                                                   \
     uint32_t stop;   /* Stop request */                                 \
     uint32_t stopped; /* Artificially stopped */                        \
-    struct QemuThread *thread;                                          \
-    CPU_COMMON_THREAD                                                   \
     struct QemuCond *halt_cond;                                         \
-    int thread_kicked;                                                  \
     struct qemu_work_item *queued_work_first, *queued_work_last;        \
     const char *cpu_model_str;                                          \
     struct KVMState *kvm_state;                                         \
diff --git a/cpus.c b/cpus.c
index 756e6245fd..b61f60eb95 100644
--- a/cpus.c
+++ b/cpus.c
@@ -686,13 +686,15 @@ static void flush_queued_work(CPUArchState *env)
 
 static void qemu_wait_io_event_common(CPUArchState *env)
 {
+    CPUState *cpu = ENV_GET_CPU(env);
+
     if (env->stop) {
         env->stop = 0;
         env->stopped = 1;
         qemu_cond_signal(&qemu_pause_cond);
     }
     flush_queued_work(env);
-    env->thread_kicked = false;
+    cpu->thread_kicked = false;
 }
 
 static void qemu_tcg_wait_io_event(void)
@@ -728,10 +730,11 @@ static void qemu_kvm_wait_io_event(CPUArchState *env)
 static void *qemu_kvm_cpu_thread_fn(void *arg)
 {
     CPUArchState *env = arg;
+    CPUState *cpu = ENV_GET_CPU(env);
     int r;
 
     qemu_mutex_lock(&qemu_global_mutex);
-    qemu_thread_get_self(env->thread);
+    qemu_thread_get_self(cpu->thread);
     env->thread_id = qemu_get_thread_id();
     cpu_single_env = env;
 
@@ -767,11 +770,12 @@ static void *qemu_dummy_cpu_thread_fn(void *arg)
     exit(1);
 #else
     CPUArchState *env = arg;
+    CPUState *cpu = ENV_GET_CPU(env);
     sigset_t waitset;
     int r;
 
     qemu_mutex_lock_iothread();
-    qemu_thread_get_self(env->thread);
+    qemu_thread_get_self(cpu->thread);
     env->thread_id = qemu_get_thread_id();
 
     sigemptyset(&waitset);
@@ -807,9 +811,10 @@ static void tcg_exec_all(void);
 static void *qemu_tcg_cpu_thread_fn(void *arg)
 {
     CPUArchState *env = arg;
+    CPUState *cpu = ENV_GET_CPU(env);
 
     qemu_tcg_init_cpu_signals();
-    qemu_thread_get_self(env->thread);
+    qemu_thread_get_self(cpu->thread);
 
     /* signal CPU creation */
     qemu_mutex_lock(&qemu_global_mutex);
@@ -842,19 +847,20 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
 
 static void qemu_cpu_kick_thread(CPUArchState *env)
 {
+    CPUState *cpu = ENV_GET_CPU(env);
 #ifndef _WIN32
     int err;
 
-    err = pthread_kill(env->thread->thread, SIG_IPI);
+    err = pthread_kill(cpu->thread->thread, SIG_IPI);
     if (err) {
         fprintf(stderr, "qemu:%s: %s", __func__, strerror(err));
         exit(1);
     }
 #else /* _WIN32 */
     if (!qemu_cpu_is_self(env)) {
-        SuspendThread(env->hThread);
+        SuspendThread(cpu->hThread);
         cpu_signal(0);
-        ResumeThread(env->hThread);
+        ResumeThread(cpu->hThread);
     }
 #endif
 }
@@ -862,11 +868,12 @@ static void qemu_cpu_kick_thread(CPUArchState *env)
 void qemu_cpu_kick(void *_env)
 {
     CPUArchState *env = _env;
+    CPUState *cpu = ENV_GET_CPU(env);
 
     qemu_cond_broadcast(env->halt_cond);
-    if (!tcg_enabled() && !env->thread_kicked) {
+    if (!tcg_enabled() && !cpu->thread_kicked) {
         qemu_cpu_kick_thread(env);
-        env->thread_kicked = true;
+        cpu->thread_kicked = true;
     }
 }
 
@@ -874,10 +881,11 @@ void qemu_cpu_kick_self(void)
 {
 #ifndef _WIN32
     assert(cpu_single_env);
+    CPUState *cpu_single_cpu = ENV_GET_CPU(cpu_single_env);
 
-    if (!cpu_single_env->thread_kicked) {
+    if (!cpu_single_cpu->thread_kicked) {
         qemu_cpu_kick_thread(cpu_single_env);
-        cpu_single_env->thread_kicked = true;
+        cpu_single_cpu->thread_kicked = true;
     }
 #else
     abort();
@@ -887,8 +895,9 @@ void qemu_cpu_kick_self(void)
 int qemu_cpu_is_self(void *_env)
 {
     CPUArchState *env = _env;
+    CPUState *cpu = ENV_GET_CPU(env);
 
-    return qemu_thread_is_self(env->thread);
+    return qemu_thread_is_self(cpu->thread);
 }
 
 void qemu_mutex_lock_iothread(void)
@@ -974,34 +983,37 @@ void resume_all_vcpus(void)
 static void qemu_tcg_init_vcpu(void *_env)
 {
     CPUArchState *env = _env;
+    CPUState *cpu = ENV_GET_CPU(env);
 
     /* share a single thread for all cpus with TCG */
     if (!tcg_cpu_thread) {
-        env->thread = g_malloc0(sizeof(QemuThread));
+        cpu->thread = g_malloc0(sizeof(QemuThread));
         env->halt_cond = g_malloc0(sizeof(QemuCond));
         qemu_cond_init(env->halt_cond);
         tcg_halt_cond = env->halt_cond;
-        qemu_thread_create(env->thread, qemu_tcg_cpu_thread_fn, env,
+        qemu_thread_create(cpu->thread, qemu_tcg_cpu_thread_fn, env,
                            QEMU_THREAD_JOINABLE);
 #ifdef _WIN32
-        env->hThread = qemu_thread_get_handle(env->thread);
+        cpu->hThread = qemu_thread_get_handle(cpu->thread);
 #endif
         while (env->created == 0) {
             qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);
         }
-        tcg_cpu_thread = env->thread;
+        tcg_cpu_thread = cpu->thread;
     } else {
-        env->thread = tcg_cpu_thread;
+        cpu->thread = tcg_cpu_thread;
         env->halt_cond = tcg_halt_cond;
     }
 }
 
 static void qemu_kvm_start_vcpu(CPUArchState *env)
 {
-    env->thread = g_malloc0(sizeof(QemuThread));
+    CPUState *cpu = ENV_GET_CPU(env);
+
+    cpu->thread = g_malloc0(sizeof(QemuThread));
     env->halt_cond = g_malloc0(sizeof(QemuCond));
     qemu_cond_init(env->halt_cond);
-    qemu_thread_create(env->thread, qemu_kvm_cpu_thread_fn, env,
+    qemu_thread_create(cpu->thread, qemu_kvm_cpu_thread_fn, env,
                        QEMU_THREAD_JOINABLE);
     while (env->created == 0) {
         qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);
@@ -1010,10 +1022,12 @@ static void qemu_kvm_start_vcpu(CPUArchState *env)
 
 static void qemu_dummy_start_vcpu(CPUArchState *env)
 {
-    env->thread = g_malloc0(sizeof(QemuThread));
+    CPUState *cpu = ENV_GET_CPU(env);
+
+    cpu->thread = g_malloc0(sizeof(QemuThread));
     env->halt_cond = g_malloc0(sizeof(QemuCond));
     qemu_cond_init(env->halt_cond);
-    qemu_thread_create(env->thread, qemu_dummy_cpu_thread_fn, env,
+    qemu_thread_create(cpu->thread, qemu_dummy_cpu_thread_fn, env,
                        QEMU_THREAD_JOINABLE);
     while (env->created == 0) {
         qemu_cond_wait(&qemu_cpu_cond, &qemu_global_mutex);
diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h
index 78b65b35fc..ad706a6dbd 100644
--- a/include/qemu/cpu.h
+++ b/include/qemu/cpu.h
@@ -21,6 +21,7 @@
 #define QEMU_CPU_H
 
 #include "qemu/object.h"
+#include "qemu-thread.h"
 
 /**
  * SECTION:cpu
@@ -61,6 +62,12 @@ struct CPUState {
     Object parent_obj;
     /*< public >*/
 
+    struct QemuThread *thread;
+#ifdef _WIN32
+    HANDLE hThread;
+#endif
+    bool thread_kicked;
+
     /* TODO Move common fields from CPUArchState here. */
 };
 
diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c
index 9e1b5fbdaa..8fbabdac36 100644
--- a/qemu-thread-posix.c
+++ b/qemu-thread-posix.c
@@ -151,7 +151,7 @@ void qemu_thread_get_self(QemuThread *thread)
     thread->thread = pthread_self();
 }
 
-int qemu_thread_is_self(QemuThread *thread)
+bool qemu_thread_is_self(QemuThread *thread)
 {
    return pthread_equal(pthread_self(), thread->thread);
 }
diff --git a/qemu-thread-win32.c b/qemu-thread-win32.c
index 3524c8b785..177b398cc4 100644
--- a/qemu-thread-win32.c
+++ b/qemu-thread-win32.c
@@ -330,7 +330,7 @@ HANDLE qemu_thread_get_handle(QemuThread *thread)
     return handle;
 }
 
-int qemu_thread_is_self(QemuThread *thread)
+bool qemu_thread_is_self(QemuThread *thread)
 {
     return GetCurrentThreadId() == thread->tid;
 }
diff --git a/qemu-thread.h b/qemu-thread.h
index a78a8f2524..05fdaaf50e 100644
--- a/qemu-thread.h
+++ b/qemu-thread.h
@@ -2,6 +2,7 @@
 #define __QEMU_THREAD_H 1
 
 #include <inttypes.h>
+#include <stdbool.h>
 
 typedef struct QemuMutex QemuMutex;
 typedef struct QemuCond QemuCond;
@@ -42,7 +43,7 @@ void qemu_thread_create(QemuThread *thread,
                         void *arg, int mode);
 void *qemu_thread_join(QemuThread *thread);
 void qemu_thread_get_self(QemuThread *thread);
-int qemu_thread_is_self(QemuThread *thread);
+bool qemu_thread_is_self(QemuThread *thread);
 void qemu_thread_exit(void *retval);
 
 #endif