Fix cpu_exit for tcp_cpu_exec

If a cpu_exit request is pending, ensure that we leave the CPU loop
quickly. For this purpose, keep the global exit_request pending until
we are about to leave tcg_cpu_exec. Also, immediately break out of the
SMP loop if the request is set, do not run till the end of the chain.
This preserves the VCPU scheduling order in SMP mode.

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:
Jan Kiszka 2010-06-25 16:56:52 +02:00 committed by Aurelien Jarno
parent f8ca7b43a5
commit c629a4bc97
2 changed files with 3 additions and 3 deletions

View File

@ -237,9 +237,8 @@ int cpu_exec(CPUState *env1)
barrier();
env = env1;
if (exit_request) {
if (unlikely(exit_request)) {
env->exit_request = 1;
exit_request = 0;
}
#if defined(TARGET_I386)

3
cpus.c
View File

@ -770,7 +770,7 @@ bool tcg_cpu_exec(void)
if (next_cpu == NULL)
next_cpu = first_cpu;
for (; next_cpu != NULL; next_cpu = next_cpu->next_cpu) {
for (; next_cpu != NULL && !exit_request; next_cpu = next_cpu->next_cpu) {
CPUState *env = cur_cpu = next_cpu;
qemu_clock_enable(vm_clock,
@ -789,6 +789,7 @@ bool tcg_cpu_exec(void)
break;
}
}
exit_request = 0;
return tcg_has_work();
}