From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56599) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R85nx-0002q4-8N for qemu-devel@nongnu.org; Mon, 26 Sep 2011 03:40:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R85nv-0001fC-VV for qemu-devel@nongnu.org; Mon, 26 Sep 2011 03:40:45 -0400 Received: from goliath.siemens.de ([192.35.17.28]:22696) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R85nv-0001f7-Mo for qemu-devel@nongnu.org; Mon, 26 Sep 2011 03:40:43 -0400 Message-ID: <4E802C77.4020903@siemens.com> Date: Mon, 26 Sep 2011 09:40:39 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] Simplify cpu_exec_all to tcg_exec_all List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel After the removal of the non-threaded mode cpu_exec_all is now only used by TCG. Refactor it accordingly, also dropping its unused return value. Signed-off-by: Jan Kiszka --- cpus.c | 14 +++++--------- cpus.h | 1 - 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/cpus.c b/cpus.c index 8978779..f983033 100644 --- a/cpus.c +++ b/cpus.c @@ -664,6 +664,8 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) return NULL; } +static void tcg_exec_all(void); + static void *qemu_tcg_cpu_thread_fn(void *arg) { CPUState *env = arg; @@ -685,7 +687,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } while (1) { - cpu_exec_all(); + tcg_exec_all(); if (use_icount && qemu_next_icount_deadline() <= 0) { qemu_notify_event(); } @@ -925,7 +927,7 @@ static int tcg_cpu_exec(CPUState *env) return ret; } -bool cpu_exec_all(void) +static void tcg_exec_all(void) { int r; @@ -942,12 +944,7 @@ bool cpu_exec_all(void) (env->singlestep_enabled & SSTEP_NOTIMER) == 0); if (cpu_can_run(env)) { - if (kvm_enabled()) { - r = kvm_cpu_exec(env); - qemu_kvm_eat_signals(env); - } else { - r = tcg_cpu_exec(env); - } + r = tcg_cpu_exec(env); if (r == EXCP_DEBUG) { cpu_handle_guest_debug(env); break; @@ -957,7 +954,6 @@ bool cpu_exec_all(void) } } exit_request = 0; - return !all_cpu_threads_idle(); } void set_numa_modes(void) diff --git a/cpus.h b/cpus.h index 5885885..bb91684 100644 --- a/cpus.h +++ b/cpus.h @@ -15,7 +15,6 @@ void cpu_synchronize_all_post_init(void); /* vl.c */ extern int smp_cores; extern int smp_threads; -bool cpu_exec_all(void); void set_numa_modes(void); void set_cpu_log(const char *optarg); void set_cpu_log_filename(const char *optarg); -- 1.7.3.4