From 472fb0c479cd98e245cce67cb525b1f15d6c1679 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Fri, 25 Jun 2010 16:56:55 +0200 Subject: [PATCH] Rename tcg_cpu_exec and tcg_has_work These functions are also used for kvm under !CONFIG_IOTHREAD, having 'tcg' in their name is just misleading. Signed-off-by: Jan Kiszka Acked-by: Paolo Bonzini Reviewed-by: Marcelo Tosatti Signed-off-by: Aurelien Jarno --- cpus.c | 10 +++++----- cpus.h | 2 +- vl.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cpus.c b/cpus.c index 7f66eda54e..03ebcb0c61 100644 --- a/cpus.c +++ b/cpus.c @@ -131,7 +131,7 @@ static int cpu_has_work(CPUState *env) return 0; } -static int tcg_has_work(void) +static int any_cpu_has_work(void) { CPUState *env; @@ -406,7 +406,7 @@ static void qemu_tcg_wait_io_event(void) { CPUState *env; - while (!tcg_has_work()) + while (!any_cpu_has_work()) qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000); qemu_mutex_unlock(&qemu_global_mutex); @@ -507,7 +507,7 @@ static void *tcg_cpu_thread_fn(void *arg) qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100); while (1) { - tcg_cpu_exec(); + cpu_exec_all(); qemu_tcg_wait_io_event(); } @@ -768,7 +768,7 @@ static int qemu_cpu_exec(CPUState *env) return ret; } -bool tcg_cpu_exec(void) +bool cpu_exec_all(void) { int ret = 0; @@ -794,7 +794,7 @@ bool tcg_cpu_exec(void) } } exit_request = 0; - return tcg_has_work(); + return any_cpu_has_work(); } void set_numa_modes(void) diff --git a/cpus.h b/cpus.h index 774150a763..af267ea07f 100644 --- a/cpus.h +++ b/cpus.h @@ -13,7 +13,7 @@ extern int smp_threads; extern int debug_requested; extern int vmstop_requested; void vm_state_notify(int running, int reason); -bool tcg_cpu_exec(void); +bool cpu_exec_all(void); void set_numa_modes(void); void set_cpu_log(const char *optarg); void list_cpus(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...), diff --git a/vl.c b/vl.c index 8a5de9fac1..ba6ee11ec4 100644 --- a/vl.c +++ b/vl.c @@ -1325,7 +1325,7 @@ static void main_loop(void) int64_t ti; #endif #ifndef CONFIG_IOTHREAD - nonblocking = tcg_cpu_exec(); + nonblocking = cpu_exec_all(); #endif #ifdef CONFIG_PROFILER ti = profile_getclock(); -- 2.11.4.GIT