aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-05-26 23:24:55 +0200
committerAndreas Färber <afaerber@suse.de>2013-06-28 13:25:12 +0200
commitfd529e8f465c0d6b2d5f01c58cee4746425d2734 (patch)
tree1903a17d5704bd2b4279e54d88871b50938817a8
parenta98ae1d8f5ee09694c148b1787e02205ee908b53 (diff)
cpus: Change qemu_kvm_wait_io_event() argument to CPUState
It no longer uses CPUArchState. Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--cpus.c6
1 files 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;