From: Avi Kivity <[email protected]> This reverts commit 733318ea9 - breaks system_reset.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/hw/apic.c b/hw/apic.c index 8cdbf51..68e5de3 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -1066,6 +1066,8 @@ 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 4d24574..4d186e5 100644 --- a/vl.c +++ b/vl.c @@ -3737,12 +3737,10 @@ 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; @@ -3767,9 +3765,6 @@ 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); -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
