don't call cpu_sychronize_state from reset handlers

Doing this will make the vcpu ioctl be issued from the I/O thread, instead
of cpu thread. The correct behaviour is to call it from within the cpu thread,
as soon as we are ready to go.

Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Glauber Costa 2009-09-02 17:18:43 -04:00 committed by Anthony Liguori
parent 98815437f7
commit 733318ea9c
2 changed files with 6 additions and 3 deletions

View File

@ -938,8 +938,6 @@ static void apic_reset(void *opaque)
APICState *s = opaque;
int bsp;
cpu_synchronize_state(s->cpu_env);
bsp = cpu_is_bsp(s->cpu_env);
s->apicbase = 0xfee00000 |
(bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;

7
vl.c
View File

@ -3683,10 +3683,12 @@ static void *kvm_cpu_thread_fn(void *arg)
while (!qemu_system_ready)
qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100);
cpu_synchronize_state(env);
while (1) {
qemu_wait_io_event(env);
if (cpu_can_run(env))
qemu_cpu_exec(env);
qemu_wait_io_event(env);
}
return NULL;
@ -3711,6 +3713,9 @@ static void *tcg_cpu_thread_fn(void *arg)
while (!qemu_system_ready)
qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100);
for (env = first_cpu; env != NULL; env = env->next_cpu) {
cpu_synchronize_state(env);
}
while (1) {
tcg_cpu_exec();
qemu_wait_io_event(cur_cpu);