mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify cpu_exec_all to tcg_exec_all

Browse Source 
After the removal of the non-threaded mode cpu_exec_all is now only used
by TCG. Refactor it accordingly, also dropping its unused return value.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2011-09-26 09:40:39 +02:00 committed by Anthony Liguori
parent b3c4bbe56d
commit bdb7ca67de
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cpus.c
View File

@ -748,6 +748,8 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
return NULL; return NULL;
} }
static void tcg_exec_all(void);
static void *qemu_tcg_cpu_thread_fn(void *arg) static void *qemu_tcg_cpu_thread_fn(void *arg)
{ {
CPUState *env = arg; CPUState *env = arg;
@ -769,7 +771,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg)
} }
while (1) { while (1) {
cpu_exec_all(); tcg_exec_all();
if (use_icount && qemu_clock_deadline(vm_clock) <= 0) { if (use_icount && qemu_clock_deadline(vm_clock) <= 0) {
qemu_notify_event(); qemu_notify_event();
} }
@ -1016,7 +1018,7 @@ static int tcg_cpu_exec(CPUState *env)
return ret; return ret;
} }
bool cpu_exec_all(void) static void tcg_exec_all(void)
{ {
int r; int r;
@ -1033,12 +1035,7 @@ bool cpu_exec_all(void)
(env->singlestep_enabled & SSTEP_NOTIMER) == 0); (env->singlestep_enabled & SSTEP_NOTIMER) == 0);
if (cpu_can_run(env)) { if (cpu_can_run(env)) {
if (kvm_enabled()) {
r = kvm_cpu_exec(env);
qemu_kvm_eat_signals(env);
} else {
r = tcg_cpu_exec(env); r = tcg_cpu_exec(env);
}
if (r == EXCP_DEBUG) { if (r == EXCP_DEBUG) {
cpu_handle_guest_debug(env); cpu_handle_guest_debug(env);
break; break;
@ -1048,7 +1045,6 @@ bool cpu_exec_all(void)
} }
} }
exit_request = 0; exit_request = 0;
return !all_cpu_threads_idle();
} }
void set_numa_modes(void) void set_numa_modes(void)

1
cpus.h
View File

@ -14,7 +14,6 @@ void cpu_synchronize_all_post_init(void);
/* vl.c */ /* vl.c */
extern int smp_cores; extern int smp_cores;
extern int smp_threads; extern int smp_threads;
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 set_cpu_log_filename(const char *optarg); void set_cpu_log_filename(const char *optarg);