From a98ae1d8f5ee09694c148b1787e02205ee908b53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Sun, 26 May 2013 23:21:08 +0200 Subject: [PATCH] cpus: Change cpu_thread_is_idle() argument to CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It no longer needs CPUArchState. Prepares for changing all_cpu_threads_idle() CPU loop to CPUState and needed for changing qemu_kvm_wait_io_event() argument to CPUState. Reviewed-by: Richard Henderson Signed-off-by: Andreas Färber --- cpus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index cce5223..5863b51 100644 --- a/cpus.c +++ b/cpus.c @@ -62,10 +62,8 @@ static CPUArchState *next_cpu; -static bool cpu_thread_is_idle(CPUArchState *env) +static bool cpu_thread_is_idle(CPUState *cpu) { - CPUState *cpu = ENV_GET_CPU(env); - if (cpu->stop || cpu->queued_work_first) { return false; } @@ -84,7 +82,7 @@ static bool all_cpu_threads_idle(void) CPUArchState *env; for (env = first_cpu; env != NULL; env = env->next_cpu) { - if (!cpu_thread_is_idle(env)) { + if (!cpu_thread_is_idle(ENV_GET_CPU(env))) { return false; } } @@ -723,7 +721,7 @@ static void qemu_kvm_wait_io_event(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); - while (cpu_thread_is_idle(env)) { + while (cpu_thread_is_idle(cpu)) { qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); } -- 2.7.4