From 733318ea9c6d846a6a047b87619e7d9d6e9707d1 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Wed, 2 Sep 2009 17:18:43 -0400 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori --- hw/apic.c | 2 -- vl.c | 7 ++++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/apic.c b/hw/apic.c index 2c414c1878..9f1d25e557 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -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; diff --git a/vl.c b/vl.c index 8e5d9db3e2..c6c6a6b59e 100644 --- a/vl.c +++ b/vl.c @@ -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); -- 2.30.2