commit ff4700b05cfb305a880762c288b88ca01c782352
author Andreas Färber <afaerber@suse.de> Mon Aug 26 18:23:18 2013 +0200
committer Andreas Färber <afaerber@suse.de> Thu Mar 13 19:20:47 2014 +0100
tree 52b073985fe082c98a9eb42c628810f588da0fc1
parent 0429a9719551a4aa794051aeb8c7b42658902c27

cpu: Move watchpoint fields from CPU_COMMON to CPUState

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

cpu-exec.c

diff --git a/cpu-exec.c b/cpu-exec.c
index 798dc08..d7c21d3 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -200,10 +200,11 @@
 
 static void cpu_handle_debug_exception(CPUArchState *env)
 {
+    CPUState *cpu = ENV_GET_CPU(env);
     CPUWatchpoint *wp;
 
-    if (!env->watchpoint_hit) {
-        QTAILQ_FOREACH(wp, &env->watchpoints, entry) {
+    if (!cpu->watchpoint_hit) {
+        QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) {
             wp->flags &= ~BP_WATCHPOINT_HIT;
         }
     }