From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=49526 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmu7o-0000hY-7B for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmu7l-0001tw-IK for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:22 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:48936) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pmu7l-0001th-8V for qemu-devel@nongnu.org; Tue, 08 Feb 2011 15:25:21 -0500 Message-ID: <4D51A6AF.8000309@web.de> Date: Tue, 08 Feb 2011 21:25:19 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <1297185509-20996-1-git-send-email-pbonzini@redhat.com> <1297185509-20996-5-git-send-email-pbonzini@redhat.com> In-Reply-To: <1297185509-20996-5-git-send-email-pbonzini@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig03B165F0F2CAA73747B441BF" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [CFT PATCH 04/12] change qemu_thread_equal API to always compare with current thread List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig03B165F0F2CAA73747B441BF Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-02-08 18:18, Paolo Bonzini wrote: > Signed-off-by: Paolo Bonzini > --- > cpus.c | 10 ++-------- > qemu-thread.c | 4 ++-- > qemu-thread.h | 2 +- > 3 files changed, 5 insertions(+), 11 deletions(-) >=20 > 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 =3D _env; > - QemuThread this; > =20 > - qemu_thread_self(&this); > - > - return qemu_thread_equal(&this, env->thread); > + return qemu_thread_equal(env->thread); > } > =20 > void qemu_mutex_lock_iothread(void) > @@ -990,10 +987,7 @@ void cpu_stop_current(void) > =20 > 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 =3D pthread_self(); > } > =20 > -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); > } > =20 > 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); > =20 > #endif I would call this "qemu_thread_is_current" or so to clarify what is tested here. JAn --------------enig03B165F0F2CAA73747B441BF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk1Rpq8ACgkQitSsb3rl5xSmCwCfRthg7XM+9uJUa6Dc03br9nwj /3gAoO3HLwPitVuMjASZxs0iSH1+QrIn =mLqU -----END PGP SIGNATURE----- --------------enig03B165F0F2CAA73747B441BF--