summaryrefslogtreecommitdiff
path: root/target-i386/helper.c
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2013-08-26 18:23:18 +0200
committerAndreas Färber <afaerber@suse.de>2014-03-13 19:20:47 +0100
commitff4700b05cfb305a880762c288b88ca01c782352 (patch)
tree52b073985fe082c98a9eb42c628810f588da0fc1 /target-i386/helper.c
parent0429a9719551a4aa794051aeb8c7b42658902c27 (diff)
downloadqemu-ff4700b05cfb305a880762c288b88ca01c782352.tar.gz
cpu: Move watchpoint fields from CPU_COMMON to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386/helper.c')
-rw-r--r--target-i386/helper.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 6d9bd71a3a..bd8da20946 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -1088,11 +1088,12 @@ bool check_hw_breakpoints(CPUX86State *env, bool force_dr6_update)
void breakpoint_handler(CPUX86State *env)
{
+ CPUState *cs = CPU(x86_env_get_cpu(env));
CPUBreakpoint *bp;
- if (env->watchpoint_hit) {
- if (env->watchpoint_hit->flags & BP_CPU) {
- env->watchpoint_hit = NULL;
+ if (cs->watchpoint_hit) {
+ if (cs->watchpoint_hit->flags & BP_CPU) {
+ cs->watchpoint_hit = NULL;
if (check_hw_breakpoints(env, false)) {
raise_exception(env, EXCP01_DB);
} else {