From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Miwog-0006UD-2o for qemu-devel@nongnu.org; Wed, 02 Sep 2009 16:52:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Miwob-0006Rr-I5 for qemu-devel@nongnu.org; Wed, 02 Sep 2009 16:52:29 -0400 Received: from [199.232.76.173] (port=51760 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Miwob-0006Rm-F5 for qemu-devel@nongnu.org; Wed, 02 Sep 2009 16:52:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32002) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Miwoa-0003Ye-F0 for qemu-devel@nongnu.org; Wed, 02 Sep 2009 16:52:24 -0400 From: Glauber Costa Date: Wed, 2 Sep 2009 17:18:43 -0400 Message-Id: <1251926323-16088-1-git-send-email-glommer@redhat.com> Subject: [Qemu-devel] [PATCH] don't call cpu_sychronize_state from reset handlers List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com 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 --- 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 2c414c1..9f1d25e 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 accd69e..ff6a597 100644 --- a/vl.c +++ b/vl.c @@ -3759,10 +3759,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; @@ -3787,6 +3789,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); -- 1.6.2.2