Support nested uc_emu_start calls

2021-11-16 21:07:03 +01:00
parent 43c643d4af
commit 247ffbe0e8
5 changed files with 54 additions and 2 deletions
--- a/qemu/accel/tcg/cpu-exec-common.c
+++ b/qemu/accel/tcg/cpu-exec-common.c
@@ -40,7 +40,7 @@ void cpu_loop_exit(CPUState *cpu)
    tb_exec_unlock(cpu->uc->tcg_ctx);
    /* Undo the setting in cpu_tb_exec.  */
    cpu->can_do_io = 1;
-    siglongjmp(cpu->jmp_env, 1);
+    siglongjmp(cpu->uc->jmp_bufs[cpu->uc->nested_level - 1], 1);
 }

 void cpu_loop_exit_restore(CPUState *cpu, uintptr_t pc)