From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44771) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1we-0000KB-MT for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wc-0005aA-G7 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:04 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35558 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wc-0005ZX-8y for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:02 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id B5EC097FF6 for ; Wed, 23 May 2012 05:09:00 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:33 +0200 Message-Id: <1337742502-28565-11-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 10/59] cpus: Pass CPUState to qemu_cpu_kick_thread() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= CPUArchState is no longer needed there. Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index 8712259..7d30e55 100644 --- a/cpus.c +++ b/cpus.c @@ -846,9 +846,8 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) return NULL; } =20 -static void qemu_cpu_kick_thread(CPUArchState *env) +static void qemu_cpu_kick_thread(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); #ifndef _WIN32 int err; =20 @@ -873,7 +872,7 @@ void qemu_cpu_kick(void *_env) =20 qemu_cond_broadcast(env->halt_cond); if (!tcg_enabled() && !cpu->thread_kicked) { - qemu_cpu_kick_thread(env); + qemu_cpu_kick_thread(cpu); cpu->thread_kicked =3D true; } } @@ -885,7 +884,7 @@ void qemu_cpu_kick_self(void) CPUState *cpu_single_cpu =3D ENV_GET_CPU(cpu_single_env); =20 if (!cpu_single_cpu->thread_kicked) { - qemu_cpu_kick_thread(cpu_single_env); + qemu_cpu_kick_thread(cpu_single_cpu); cpu_single_cpu->thread_kicked =3D true; } #else @@ -905,7 +904,7 @@ void qemu_mutex_lock_iothread(void) } else { iothread_requesting_mutex =3D true; if (qemu_mutex_trylock(&qemu_global_mutex)) { - qemu_cpu_kick_thread(first_cpu); + qemu_cpu_kick_thread(ENV_GET_CPU(first_cpu)); qemu_mutex_lock(&qemu_global_mutex); } iothread_requesting_mutex =3D false; --=20 1.7.7