commit 1c3569fe4e4e3783b7813f450fa699d3f552e44f
author Paolo Bonzini <pbonzini@redhat.com> Fri Jan 15 09:42:07 2010 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Tue Jan 19 16:31:03 2010 -0600
tree ccd7067e4de218a989cb42a4dfec53f9d762c5f7
parent 040f2fb249e15e7becbb6d851fbf1820e07c2391

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 <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

cpu-exec.c

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 @@
 
 void cpu_loop_exit(void)
 {
+    env->current_tb = NULL;
     longjmp(env->jmp_env, 1);
 }
 
@@ -107,6 +108,7 @@
     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