From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wj-0000OD-52 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1we-0005cH-Mj for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:08 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35573 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1we-0005bR-E6 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:04 -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 657469735A for ; Wed, 23 May 2012 05:09:03 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:39 +0200 Message-Id: <1337742502-28565-17-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 16/59] cpus: Pass CPUState to cpu_can_run() 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. Also change its return type to bool. Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cpus.c b/cpus.c index 753277d..c0f253e 100644 --- a/cpus.c +++ b/cpus.c @@ -422,17 +422,15 @@ static void do_vm_stop(RunState state) } } =20 -static int cpu_can_run(CPUArchState *env) +static bool cpu_can_run(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); - if (cpu->stop) { - return 0; + return false; } if (cpu->stopped || !runstate_is_running()) { - return 0; + return false; } - return 1; + return true; } =20 static bool cpu_thread_is_idle(CPUArchState *env) @@ -758,7 +756,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) qemu_cond_signal(&qemu_cpu_cond); =20 while (1) { - if (cpu_can_run(env)) { + if (cpu_can_run(cpu)) { r =3D kvm_cpu_exec(env); if (r =3D=3D EXCP_DEBUG) { cpu_handle_guest_debug(env); @@ -1150,7 +1148,7 @@ static void tcg_exec_all(void) qemu_clock_enable(vm_clock, (env->singlestep_enabled & SSTEP_NOTIMER) =3D=3D= 0); =20 - if (cpu_can_run(env)) { + if (cpu_can_run(cpu)) { r =3D tcg_cpu_exec(env); if (r =3D=3D EXCP_DEBUG) { cpu_handle_guest_debug(env); --=20 1.7.7