mirror of https://github.com/proxmox/mirror_qemu
parent
f0d14a95a5
commit
24d90a3cfd
|
@ -410,7 +410,8 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
|
||||||
handlers = &s->rom_state.mp;
|
handlers = &s->rom_state.mp;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!kvm_enabled()) {
|
if (tcg_enabled()) {
|
||||||
|
cpu_restore_state(cs, cs->mem_io_pc);
|
||||||
cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base,
|
cpu_get_tb_cpu_state(env, ¤t_pc, ¤t_cs_base,
|
||||||
¤t_flags);
|
¤t_flags);
|
||||||
/* Account this instruction, because we will exit the tb.
|
/* Account this instruction, because we will exit the tb.
|
||||||
|
@ -456,7 +457,7 @@ static void patch_instruction(VAPICROMState *s, X86CPU *cpu, target_ulong ip)
|
||||||
|
|
||||||
resume_all_vcpus();
|
resume_all_vcpus();
|
||||||
|
|
||||||
if (!kvm_enabled()) {
|
if (tcg_enabled()) {
|
||||||
/* Both tb_lock and iothread_mutex will be reset when
|
/* Both tb_lock and iothread_mutex will be reset when
|
||||||
* longjmps back into the cpu_exec loop. */
|
* longjmps back into the cpu_exec loop. */
|
||||||
tb_lock();
|
tb_lock();
|
||||||
|
|
Loading…
Reference in New Issue