tcg_has_work is the only user of cpu-exec.c's qemu_cpu_has_work export. Just move everything into cpu-exec.c.
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> --- cpu-all.h | 2 +- cpu-exec.c | 16 ++++++++++++++-- vl.c | 28 ++-------------------------- 3 files changed, 17 insertions(+), 29 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index e214374..aef594d 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -781,7 +781,7 @@ void cpu_reset_interrupt(CPUState *env, int mask); void cpu_exit(CPUState *s); -int qemu_cpu_has_work(CPUState *env); +int qemu_cpus_have_work(void); /* Breakpoint/watchpoint flags */ #define BP_MEM_READ 0x01 diff --git a/cpu-exec.c b/cpu-exec.c index af4595b..b458484 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -49,9 +49,21 @@ int tb_invalidated_flag; //#define CONFIG_DEBUG_EXEC //#define DEBUG_SIGNAL -int qemu_cpu_has_work(CPUState *env) +int qemu_cpus_have_work(void) { - return cpu_has_work(env); + CPUState *env; + + for (env = first_cpu; env != NULL; env = env->next_cpu) { + if (env->stop) + return 1; + if (env->stopped) + return 0; + if (!env->halted) + return 1; + if (cpu_has_work(env)) + return 1; + } + return 0; } void cpu_loop_exit(void) diff --git a/vl.c b/vl.c index 9f363c8..9bf9806 100644 --- a/vl.c +++ b/vl.c @@ -3435,7 +3435,6 @@ static QemuCond qemu_pause_cond; static void block_io_signals(void); static void unblock_io_signals(void); -static int tcg_has_work(void); static int qemu_init_main_loop(void) { @@ -3458,7 +3457,7 @@ static int qemu_init_main_loop(void) static void qemu_wait_io_event(CPUState *env) { - while (!tcg_has_work()) + while (!qemu_cpus_have_work()) qemu_cond_timedwait(env->halt_cond, &qemu_global_mutex, 1000); qemu_mutex_unlock(&qemu_global_mutex); @@ -3922,29 +3921,6 @@ static void tcg_cpu_exec(void) } } -static int cpu_has_work(CPUState *env) -{ - if (env->stop) - return 1; - if (env->stopped) - return 0; - if (!env->halted) - return 1; - if (qemu_cpu_has_work(env)) - return 1; - return 0; -} - -static int tcg_has_work(void) -{ - CPUState *env; - - for (env = first_cpu; env != NULL; env = env->next_cpu) - if (cpu_has_work(env)) - return 1; - return 0; -} - static int qemu_calculate_timeout(void) { #ifndef CONFIG_IOTHREAD @@ -3952,7 +3928,7 @@ static int qemu_calculate_timeout(void) if (!vm_running) timeout = 5000; - else if (tcg_has_work()) + else if (qemu_cpus_have_work()) timeout = 0; else { /* XXX: use timeout computed from timers */ -- 1.6.5.2