From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ml6fn-0001RS-8p for qemu-devel@nongnu.org; Tue, 08 Sep 2009 15:48:15 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ml6fi-0001Qk-2J for qemu-devel@nongnu.org; Tue, 08 Sep 2009 15:48:14 -0400 Received: from [199.232.76.173] (port=49325 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ml6fh-0001Qh-RZ for qemu-devel@nongnu.org; Tue, 08 Sep 2009 15:48:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11015) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ml6fh-00042P-C9 for qemu-devel@nongnu.org; Tue, 08 Sep 2009 15:48:09 -0400 From: Glauber Costa Date: Tue, 8 Sep 2009 16:14:29 -0400 Message-Id: <1252440869-15956-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] do proper cpu_self check List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- vl.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/vl.c b/vl.c index a894285..604e996 100644 --- a/vl.c +++ b/vl.c @@ -3803,9 +3803,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) -- 1.6.2.5