From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wq-0000kb-BM for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wn-0005jj-Si for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:15 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35613 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wn-0005ia-L8 for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:13 -0400 Received: from relay2.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 9B0429735A for ; Wed, 23 May 2012 05:09:12 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:00 +0200 Message-Id: <1337742502-28565-38-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 37/59] cpus: Pass CPUState to qemu_wait_io_event_common() 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 | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cpus.c b/cpus.c index 2e7eafb..83880e7 100644 --- a/cpus.c +++ b/cpus.c @@ -689,10 +689,8 @@ static void flush_queued_work(CPUState *cpu) qemu_cond_broadcast(&qemu_work_cond); } =20 -static void qemu_wait_io_event_common(CPUArchState *env) +static void qemu_wait_io_event_common(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); - if (cpu->stop) { cpu->stop =3D false; cpu->stopped =3D true; @@ -718,7 +716,7 @@ static void qemu_tcg_wait_io_event(void) } =20 for (env =3D first_cpu; env !=3D NULL; env =3D env->next_cpu) { - qemu_wait_io_event_common(env); + qemu_wait_io_event_common(ENV_GET_CPU(env)); } } =20 @@ -731,7 +729,7 @@ static void qemu_kvm_wait_io_event(CPUArchState *env) } =20 qemu_kvm_eat_signals(env); - qemu_wait_io_event_common(env); + qemu_wait_io_event_common(cpu); } =20 static void *qemu_kvm_cpu_thread_fn(void *arg) @@ -806,7 +804,7 @@ static void *qemu_dummy_cpu_thread_fn(void *arg) } qemu_mutex_lock_iothread(); cpu_single_env =3D env; - qemu_wait_io_event_common(env); + qemu_wait_io_event_common(cpu); } =20 return NULL; @@ -838,7 +836,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) =20 /* process any pending work */ for (env =3D first_cpu; env !=3D NULL; env =3D env->next_cpu) { - qemu_wait_io_event_common(env); + qemu_wait_io_event_common(ENV_GET_CPU(env)); } } =20 --=20 1.7.7