From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49144 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PrRN6-0004fD-4k for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:43:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PrRN4-0000JZ-To for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:43:55 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:61006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PrRN4-0000I2-PE for qemu-devel@nongnu.org; Mon, 21 Feb 2011 03:43:54 -0500 Received: by mail-wy0-f173.google.com with SMTP id 29so1150726wyb.4 for ; Mon, 21 Feb 2011 00:43:54 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 21 Feb 2011 09:43:23 +0100 Message-Id: <1298277820-8817-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1298277820-8817-1-git-send-email-pbonzini@redhat.com> References: <1298277820-8817-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 04/21] replace qemu_thread_equal API with qemu_thread_is_current List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- cpus.c | 10 ++-------- qemu-thread.c | 4 ++-- qemu-thread.h | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/cpus.c b/cpus.c index 0f33945..aa30474 100644 --- a/cpus.c +++ b/cpus.c @@ -891,11 +891,8 @@ void qemu_cpu_kick_self(void) int qemu_cpu_self(void *_env) { CPUState *env = _env; - QemuThread this; - qemu_thread_self(&this); - - return qemu_thread_equal(&this, env->thread); + return qemu_thread_is_current(env->thread); } void qemu_mutex_lock_iothread(void) @@ -1023,10 +1020,7 @@ void cpu_stop_current(void) void vm_stop(int reason) { - QemuThread me; - qemu_thread_self(&me); - - if (!qemu_thread_equal(&me, &io_thread)) { + if (!qemu_thread_is_current(&io_thread)) { qemu_system_vmstop_request(reason); /* * FIXME: should not return to device code in case diff --git a/qemu-thread.c b/qemu-thread.c index fbc78fe..28b3f80 100644 --- a/qemu-thread.c +++ b/qemu-thread.c @@ -181,9 +181,9 @@ void qemu_thread_self(QemuThread *thread) thread->thread = pthread_self(); } -int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2) +int qemu_thread_is_current(QemuThread *thread) { - return pthread_equal(thread1->thread, thread2->thread); + return pthread_equal(pthread_self(), thread->thread); } void qemu_thread_exit(void *retval) diff --git a/qemu-thread.h b/qemu-thread.h index 19bb30c..a7e35b4 100644 --- a/qemu-thread.h +++ b/qemu-thread.h @@ -38,7 +38,7 @@ void qemu_thread_create(QemuThread *thread, void *arg); void qemu_thread_signal(QemuThread *thread, int sig); void qemu_thread_self(QemuThread *thread); -int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2); +int qemu_thread_is_current(QemuThread *thread); void qemu_thread_exit(void *retval); #endif -- 1.7.3.5