From fd529e8f465c0d6b2d5f01c58cee4746425d2734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 26 May 2013 23:24:55 +0200 Subject: [PATCH] cpus: Change qemu_kvm_wait_io_event() argument to CPUState MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It no longer uses CPUArchState. Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState. Reviewed-by: Richard Henderson Signed-off-by: Andreas Färber --- cpus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 5863b517a9..37369aeb8e 100644 --- a/cpus.c +++ b/cpus.c @@ -717,10 +717,8 @@ static void qemu_tcg_wait_io_event(void) } } -static void qemu_kvm_wait_io_event(CPUArchState *env) +static void qemu_kvm_wait_io_event(CPUState *cpu) { - CPUState *cpu = ENV_GET_CPU(env); - while (cpu_thread_is_idle(cpu)) { qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); } @@ -759,7 +757,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) cpu_handle_guest_debug(env); } } - qemu_kvm_wait_io_event(env); + qemu_kvm_wait_io_event(cpu); } return NULL;