From ade42176d7be5ad23a6d8e24170ee9bb2a0d48d7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 15 Jan 2010 09:42:07 +0100 Subject: [PATCH] clean up env->current_tb There are three paths from the innermost while loop of cpu_exec to the top of the outermost for loop. Two do not reset env->current_tb. Fix this. Signed-off-by: Paolo Bonzini Signed-off-by: Anthony Liguori --- cpu-exec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpu-exec.c b/cpu-exec.c index 2f119a9..2b3e698 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -56,6 +56,7 @@ int qemu_cpu_has_work(CPUState *env) void cpu_loop_exit(void) { + env->current_tb = NULL; longjmp(env->jmp_env, 1); } @@ -107,6 +108,7 @@ static void cpu_exec_nocache(int max_cycles, TranslationBlock *orig_tb) env->current_tb = tb; /* execute the generated code */ next_tb = tcg_qemu_tb_exec(tb->tc_ptr); + env->current_tb = NULL; if ((next_tb & 3) == 2) { /* Restore PC. This may happen if async event occurs before -- 2.7.4