From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull3q-0007vR-A1 for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull3n-0000OB-LO for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44351 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull3n-0000O2-EW for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:13:51 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0A8BBA398F for ; Sun, 9 Jun 2013 21:13:51 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 9 Jun 2013 21:12:37 +0200 Message-Id: <1370805206-26574-11-git-send-email-afaerber@suse.de> In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-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-cpu 10/59] cpus: Simplify qemu_tcg_wait_io_event() and qemu_tcg_cpu_thread_fn() 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?= Use new qemu_for_each_cpu(). Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/cpus.c b/cpus.c index 9195bc3..a8572a9 100644 --- a/cpus.c +++ b/cpus.c @@ -703,10 +703,13 @@ static void qemu_wait_io_event_common(CPUState *cpu= ) cpu->thread_kicked =3D false; } =20 -static void qemu_tcg_wait_io_event(void) +static void qemu_wait_one_io_event_common(CPUState *cpu, void *data) { - CPUArchState *env; + qemu_wait_io_event_common(cpu); +} =20 +static void qemu_tcg_wait_io_event(void) +{ while (all_cpu_threads_idle()) { /* Start accounting real time to the virtual clock if the CPUs are idle. */ @@ -718,9 +721,7 @@ static void qemu_tcg_wait_io_event(void) qemu_cond_wait(&qemu_io_proceeded_cond, &qemu_global_mutex); } =20 - for (env =3D first_cpu; env !=3D NULL; env =3D env->next_cpu) { - qemu_wait_io_event_common(ENV_GET_CPU(env)); - } + qemu_for_each_cpu(qemu_wait_one_io_event_common, NULL); } =20 static void qemu_kvm_wait_io_event(CPUArchState *env) @@ -825,7 +826,6 @@ static void tcg_signal_cpu_creation(CPUState *cpu, vo= id *data) static void *qemu_tcg_cpu_thread_fn(void *arg) { CPUState *cpu =3D arg; - CPUArchState *env; =20 qemu_tcg_init_cpu_signals(); qemu_thread_get_self(cpu->thread); @@ -839,9 +839,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) qemu_cond_wait(tcg_halt_cond, &qemu_global_mutex); =20 /* process any pending work */ - for (env =3D first_cpu; env !=3D NULL; env =3D env->next_cpu) { - qemu_wait_io_event_common(ENV_GET_CPU(env)); - } + qemu_for_each_cpu(qemu_wait_one_io_event_common, NULL); } =20 while (1) { --=20 1.8.1.4