From 6cabe1f303b9d76458c00f00df7f477449a13b2f Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 25 Jun 2010 16:56:53 +0200 Subject: [PATCH] Fix qemu_wait_io_event processing in io-thread mode When checking for I/O events in the tcg CPU loop, make sure that we call qemu_wait_io_event_common for all CPUs, not only the current one. Otherwise pause_all_vcpus may lock up or run_on_cpu requests may starve. Rename qemu_wait_io_event to qemu_tcg_wait_io_event at this chance and purge its argument list as it has no use for it. Signed-off-by: Jan Kiszka Acked-by: Paolo Bonzini Reviewed-by: Marcelo Tosatti Signed-off-by: Aurelien Jarno --- cpus.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 7533668d2b..5022788e53 100644 --- a/cpus.c +++ b/cpus.c @@ -403,10 +403,12 @@ static void qemu_wait_io_event_common(CPUState *env) flush_queued_work(env); } -static void qemu_wait_io_event(CPUState *env) +static void qemu_tcg_wait_io_event(void) { + CPUState *env; + while (!tcg_has_work()) - qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); + qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); qemu_mutex_unlock(&qemu_global_mutex); @@ -419,7 +421,10 @@ static void qemu_wait_io_event(CPUState *env) qemu_mutex_unlock(&qemu_fair_mutex); qemu_mutex_lock(&qemu_global_mutex); - qemu_wait_io_event_common(env); + + for (env = first_cpu; env != NULL; env = env->next_cpu) { + qemu_wait_io_event_common(env); + } } static void qemu_kvm_eat_signal(CPUState *env, int timeout) @@ -504,7 +509,7 @@ static void *tcg_cpu_thread_fn(void *arg) while (1) { tcg_cpu_exec(); - qemu_wait_io_event(cur_cpu); + qemu_tcg_wait_io_event(); } return NULL;