Message ID | 1254944284-12688-3-git-send-email-glommer@redhat.com |
---|---|
State | Not Applicable |
Headers | show |
diff --git a/vl.c b/vl.c index 3012141..e141bd1 100644 --- a/vl.c +++ b/vl.c @@ -3582,9 +3582,14 @@ void qemu_cpu_kick(void *_env) qemu_thread_signal(env->thread, SIGUSR1); } -int qemu_cpu_self(void *env) +int qemu_cpu_self(void *_env) { - return (cpu_single_env != NULL); + CPUState *env = _env; + QemuThread this; + + qemu_thread_self(&this); + + return qemu_thread_equal(&this, env->thread); } static void cpu_signal(int sig)
Currently, our check for qemu_cpu_self only checks if there is a cpu currently in execution (represented by cpu_single_env being set). While this might be okay for tcg, it is certainly not okay for kvm, since multiple cpus might be executing. Instead, I propose we use pthread primitives to test if the caller thread is the same as env->thread. For tcg, it will have the same semantics as before, since all CPUStates will point to the same thread, and we'll only have one in execution at a time. Signed-off-by: Glauber Costa <glommer@redhat.com> --- vl.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)