diff options
| author | Claudio Fontana <cfontana@suse.de> | 2021-02-04 17:39:22 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-02-05 10:24:14 -1000 |
| commit | c73bdb35a91fb6b17c2c93b1ba381fc88a406f8d (patch) | |
| tree | 4583576d78cef9d8fa278a9c4ffa6941356966d3 /softmmu/physmem.c | |
| parent | 9ea9087bb4a86893e4ac6ff643837937dc9e5849 (diff) | |
| download | qemu-c73bdb35a91fb6b17c2c93b1ba381fc88a406f8d.zip qemu-c73bdb35a91fb6b17c2c93b1ba381fc88a406f8d.tar.gz qemu-c73bdb35a91fb6b17c2c93b1ba381fc88a406f8d.tar.bz2 | |
cpu: move debug_check_watchpoint to tcg_ops
commit 568496c0c0f1 ("cpu: Add callback to check architectural") and
commit 3826121d9298 ("target-arm: Implement checking of fired")
introduced an ARM-specific hack for cpu_check_watchpoint.
Make debug_check_watchpoint optional, and move it to tcg_ops.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210204163931.7358-15-cfontana@suse.de>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'softmmu/physmem.c')
| -rw-r--r-- | softmmu/physmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 3d9a9c3..9e64cf7 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -917,8 +917,8 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, wp->hitaddr = MAX(addr, wp->vaddr); wp->hitattrs = attrs; if (!cpu->watchpoint_hit) { - if (wp->flags & BP_CPU && - !cc->debug_check_watchpoint(cpu, wp)) { + if (wp->flags & BP_CPU && cc->tcg_ops.debug_check_watchpoint && + !cc->tcg_ops.debug_check_watchpoint(cpu, wp)) { wp->flags &= ~BP_WATCHPOINT_HIT; continue; } |