summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2010-06-25 16:56:55 +0200
committerAurelien Jarno <aurelien@aurel32.net>2010-07-22 05:52:09 +0200
commitd821d21f3a9c431d4aff35dd1a0f15185aec9024 (patch)
treeaa0681a1d8df5a407768deee9e6086a288ec75d9
parent10b379a472c30243f3ae539594ba2e93ebfb2902 (diff)
downloadqemu-d821d21f3a9c431d4aff35dd1a0f15185aec9024.tar.gz
qemu-d821d21f3a9c431d4aff35dd1a0f15185aec9024.tar.bz2
qemu-d821d21f3a9c431d4aff35dd1a0f15185aec9024.zip
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 <jan.kiszka@siemens.com> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--cpus.c10
-rw-r--r--cpus.h2
-rw-r--r--vl.c2
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();