[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [CFT PATCH 04/12] change qemu_thread_equal API to always co
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [CFT PATCH 04/12] change qemu_thread_equal API to always compare with current thread |
Date: |
Tue, 8 Feb 2011 18:18:21 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
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 474be16..c1d0ceb 100644
--- a/cpus.c
+++ b/cpus.c
@@ -857,11 +857,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_equal(env->thread);
}
void qemu_mutex_lock_iothread(void)
@@ -990,10 +987,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_equal(&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..7f5c0b6 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_equal(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..fa4bfb9 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_equal(QemuThread *thread);
void qemu_thread_exit(void *retval);
#endif
--
1.7.3.5
- [Qemu-devel] [CFT PATCH 12/12] iothread stops the vcpu thread via IPI, (continued)
- Re: [Qemu-devel] [CFT PATCH 00/12] Tricky parts of my iothread-for-win32 stuff, Aurelien Jarno, 2011/02/08
- [Qemu-devel] [CFT PATCH 10/12] do not use timedwait on qemu_pause_cond, Paolo Bonzini, 2011/02/08
- [Qemu-devel] [CFT PATCH 04/12] change qemu_thread_equal API to always compare with current thread,
Paolo Bonzini <=
- [Qemu-devel] [CFT PATCH 05/12] always qemu_cpu_kick after unhalting a cpu, Paolo Bonzini, 2011/02/08
- [Qemu-devel] Re: [CFT PATCH 00/12] Tricky parts of my iothread-for-win32 stuff, Jan Kiszka, 2011/02/08