@@ -910,6 +910,16 @@ void qemu_init_cpu_loop(void)
qemu_thread_get_self(&io_thread);
}
+static void wait_cpu_work(void)
+{
+ qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex);
+}
+
+static void signal_cpu_work(void)
+{
+ qemu_cond_broadcast(&qemu_work_cond);
+}
+
static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)
{
qemu_mutex_lock(&cpu->work_mutex);
@@ -943,7 +953,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, void *data)
while (!atomic_mb_read(&wi.done)) {
CPUState *self_cpu = current_cpu;
- qemu_cond_wait(&qemu_work_cond, &qemu_global_mutex);
+ wait_cpu_work();
current_cpu = self_cpu;
}
}
@@ -1002,7 +1012,7 @@ static void flush_queued_work(CPUState *cpu)
}
}
qemu_mutex_unlock(&cpu->work_mutex);
- qemu_cond_broadcast(&qemu_work_cond);
+ signal_cpu_work();
}
static void qemu_wait_io_event_common(CPUState *cpu)