1 files changed, 4 insertions, 2 deletions
diff --git a/exec.c b/exec.c
index b85508b..a41bcb8 100644
--- a/exec.c
+++ b/exec.c
@@ -492,8 +492,10 @@ void cpu_reset_interrupt(CPUArchState *env, int mask)
 
 void cpu_exit(CPUArchState *env)
 {
-    env->exit_request = 1;
-    cpu_unlink_tb(env);
+    CPUState *cpu = ENV_GET_CPU(env);
+
+    cpu->exit_request = 1;
+    cpu_unlink_tb(cpu);
 }
 
 void cpu_abort(CPUArchState *env, const char *fmt, ...)