@@ -722,10 +722,8 @@ static void qemu_tcg_wait_io_event(void)
qemu_for_each_cpu(qemu_wait_one_io_event_common, NULL);
}
-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);
}
@@ -764,7 +762,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;
It no longer uses CPUArchState. Signed-off-by: Andreas Färber <afaerber@suse.de> --- cpus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)