@@ -3434,6 +3434,24 @@ static void block_io_signals(void);
static void unblock_io_signals(void);
static int tcg_has_work(void);
+static pthread_key_t current_env;
+
+CPUState *qemu_get_current_env(void);
+CPUState *qemu_get_current_env(void)
+{
+ return pthread_getspecific(current_env);
+}
+
+static void qemu_set_current_env(CPUState *env)
+{
+ pthread_setspecific(current_env, env);
+}
+
+static void qemu_init_current_env(void)
+{
+ pthread_key_create(¤t_env, NULL);
+}
+
static int qemu_init_main_loop(void)
{
int ret;
@@ -3446,6 +3464,7 @@ static int qemu_init_main_loop(void)
qemu_mutex_init(&qemu_fair_mutex);
qemu_mutex_init(&qemu_global_mutex);
qemu_mutex_lock(&qemu_global_mutex);
+ qemu_init_current_env();
unblock_io_signals();
qemu_thread_self(&io_thread);
@@ -3484,6 +3503,8 @@ static void *kvm_cpu_thread_fn(void *arg)
block_io_signals();
qemu_thread_self(env->thread);
+ qemu_set_current_env(env);
+
if (kvm_enabled())
kvm_init_vcpu(env);
Since we'll have multiple cpu threads, at least for kvm, we need a way to store and retrieve the CPUState associated with the current execution thread. For the I/O thread, this will be NULL. I am using pthread functions for that, for portability, but we could as well use __thread keyword. Signed-off-by: Glauber Costa <glommer@redhat.com> --- vl.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-)