openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "don't call cpu_sychronize_state from reset handlers" 

This reverts commit 733318ea9c.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2009-09-10 08:45:43 -05:00
parent 02b33596d0
commit 1c3173b9ed
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/apic.c
View File

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

7
vl.c
View File

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