commit 27103424c40ce71053c07d8a54ef431365fa9b7f
author Andreas Färber <afaerber@suse.de> Mon Aug 26 08:31:06 2013 +0200
committer Andreas Färber <afaerber@suse.de> Thu Mar 13 19:20:46 2014 +0100
tree bec190ce2f52c17d5f5963d743f6c64af47c9240
parent 6f03bef0ffc5cd75ac5ffcca0383c489ae48108c

cpu: Move exception_index field from CPU_COMMON to CPUState

Signed-off-by: Andreas Färber <afaerber@suse.de>

user-exec.c

diff --git a/user-exec.c b/user-exec.c
index dec636e..dbb9c8d 100644
--- a/user-exec.c
+++ b/user-exec.c
@@ -41,7 +41,9 @@
 static void exception_action(CPUArchState *env1)
 {
 #if defined(TARGET_I386)
-    raise_exception_err(env1, env1->exception_index, env1->error_code);
+    CPUState *cpu = ENV_GET_CPU(env1);
+
+    raise_exception_err(env1, cpu->exception_index, env1->error_code);
 #else
     cpu_loop_exit(env1);
 #endif
@@ -71,7 +73,7 @@
         sigprocmask(SIG_SETMASK, &uc->sc_mask, NULL);
 #endif
     }
-    env1->exception_index = -1;
+    cpu->exception_index = -1;
     siglongjmp(cpu->jmp_env, 1);
 }