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>
This commit is contained in:
parent
345f4426a9
commit
472fb0c479
10
cpus.c
10
cpus.c
@ -131,7 +131,7 @@ static int cpu_has_work(CPUState *env)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int tcg_has_work(void)
|
static int any_cpu_has_work(void)
|
||||||
{
|
{
|
||||||
CPUState *env;
|
CPUState *env;
|
||||||
|
|
||||||
@ -406,7 +406,7 @@ static void qemu_tcg_wait_io_event(void)
|
|||||||
{
|
{
|
||||||
CPUState *env;
|
CPUState *env;
|
||||||
|
|
||||||
while (!tcg_has_work())
|
while (!any_cpu_has_work())
|
||||||
qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000);
|
qemu_cond_timedwait(tcg_halt_cond, &qemu_global_mutex, 1000);
|
||||||
|
|
||||||
qemu_mutex_unlock(&qemu_global_mutex);
|
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);
|
qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100);
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
tcg_cpu_exec();
|
cpu_exec_all();
|
||||||
qemu_tcg_wait_io_event();
|
qemu_tcg_wait_io_event();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -768,7 +768,7 @@ static int qemu_cpu_exec(CPUState *env)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool tcg_cpu_exec(void)
|
bool cpu_exec_all(void)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
@ -794,7 +794,7 @@ bool tcg_cpu_exec(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
exit_request = 0;
|
exit_request = 0;
|
||||||
return tcg_has_work();
|
return any_cpu_has_work();
|
||||||
}
|
}
|
||||||
|
|
||||||
void set_numa_modes(void)
|
void set_numa_modes(void)
|
||||||
|
2
cpus.h
2
cpus.h
@ -13,7 +13,7 @@ extern int smp_threads;
|
|||||||
extern int debug_requested;
|
extern int debug_requested;
|
||||||
extern int vmstop_requested;
|
extern int vmstop_requested;
|
||||||
void vm_state_notify(int running, int reason);
|
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_numa_modes(void);
|
||||||
void set_cpu_log(const char *optarg);
|
void set_cpu_log(const char *optarg);
|
||||||
void list_cpus(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
|
void list_cpus(FILE *f, int (*cpu_fprintf)(FILE *f, const char *fmt, ...),
|
||||||
|
2
vl.c
2
vl.c
@ -1325,7 +1325,7 @@ static void main_loop(void)
|
|||||||
int64_t ti;
|
int64_t ti;
|
||||||
#endif
|
#endif
|
||||||
#ifndef CONFIG_IOTHREAD
|
#ifndef CONFIG_IOTHREAD
|
||||||
nonblocking = tcg_cpu_exec();
|
nonblocking = cpu_exec_all();
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PROFILER
|
#ifdef CONFIG_PROFILER
|
||||||
ti = profile_getclock();
|
ti = profile_getclock();
|
||||||
|
Loading…
Reference in New Issue
Block a user