Move the contents of watchpoint.h into breakpoint.h. Adjust all users of exec/watchpoint.h.
Signed-off-by: Richard Henderson <[email protected]> --- include/exec/breakpoint.h | 7 +++++++ include/exec/watchpoint.h | 20 -------------------- accel/tcg/tcg-accel-ops.c | 2 +- accel/tcg/user-exec-stub.c | 2 +- system/watchpoint.c | 2 +- target/arm/debug_helper.c | 2 +- target/arm/tcg/debug.c | 2 +- target/i386/cpu.c | 2 +- target/i386/machine.c | 2 +- target/i386/tcg/system/bpt_helper.c | 2 +- target/ppc/cpu.c | 2 +- target/ppc/cpu_init.c | 2 +- target/riscv/debug.c | 2 +- target/s390x/helper.c | 1 - target/s390x/tcg/debug.c | 1 - target/xtensa/dbg_helper.c | 2 +- 16 files changed, 19 insertions(+), 34 deletions(-) delete mode 100644 include/exec/watchpoint.h diff --git a/include/exec/breakpoint.h b/include/exec/breakpoint.h index e6aa630d17..c886f3afb7 100644 --- a/include/exec/breakpoint.h +++ b/include/exec/breakpoint.h @@ -50,4 +50,11 @@ void cpu_breakpoint_remove_by_ref(CPUState *cpu, CPUBreakpoint *breakpoint); void cpu_breakpoint_remove_all(CPUState *cpu, BreakpointFlags mask); bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, BreakpointFlags mask); +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, + BreakpointFlags flags, CPUWatchpoint **watchpoint); +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, + vaddr len, BreakpointFlags flags); +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); +void cpu_watchpoint_remove_all(CPUState *cpu, BreakpointFlags mask); + #endif diff --git a/include/exec/watchpoint.h b/include/exec/watchpoint.h deleted file mode 100644 index a09daf47f1..0000000000 --- a/include/exec/watchpoint.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * CPU watchpoints - * - * Copyright (c) 2012 SUSE LINUX Products GmbH - * SPDX-License-Identifier: LGPL-2.1-or-later - */ - -#ifndef EXEC_WATCHPOINT_H -#define EXEC_WATCHPOINT_H - -#include "exec/breakpoint.h" - -int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, - BreakpointFlags flags, CPUWatchpoint **watchpoint); -int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, - vaddr len, BreakpointFlags flags); -void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); -void cpu_watchpoint_remove_all(CPUState *cpu, BreakpointFlags mask); - -#endif /* EXEC_WATCHPOINT_H */ diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 0aba254b81..c59ab85606 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -39,7 +39,7 @@ #include "exec/hwaddr.h" #include "exec/tb-flush.h" #include "exec/translation-block.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "gdbstub/enums.h" #include "hw/core/cpu.h" diff --git a/accel/tcg/user-exec-stub.c b/accel/tcg/user-exec-stub.c index a10ff03922..973bdbcd7a 100644 --- a/accel/tcg/user-exec-stub.c +++ b/accel/tcg/user-exec-stub.c @@ -2,7 +2,7 @@ #include "hw/core/cpu.h" #include "accel/tcg/cpu-ops.h" #include "exec/replay-core.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "internal-common.h" void cpu_resume(CPUState *cpu) diff --git a/system/watchpoint.c b/system/watchpoint.c index 3785ffff46..67e4560e78 100644 --- a/system/watchpoint.c +++ b/system/watchpoint.c @@ -21,7 +21,7 @@ #include "qemu/error-report.h" #include "exec/cputlb.h" #include "exec/target_page.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "hw/core/cpu.h" /* Add a watchpoint. */ diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c index 8477ca5def..2c3a56c7d5 100644 --- a/target/arm/debug_helper.c +++ b/target/arm/debug_helper.c @@ -11,7 +11,7 @@ #include "internals.h" #include "cpu-features.h" #include "cpregs.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "system/tcg.h" /* diff --git a/target/arm/tcg/debug.c b/target/arm/tcg/debug.c index 7171501d40..f245d5b072 100644 --- a/target/arm/tcg/debug.c +++ b/target/arm/tcg/debug.c @@ -12,7 +12,7 @@ #include "internals.h" #include "cpu-features.h" #include "cpregs.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "system/tcg.h" /* Return the Exception Level targeted by debug exceptions. */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 5805d33ab9..7a7cd38b14 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -39,7 +39,7 @@ #include "standard-headers/asm-x86/kvm_para.h" #include "hw/core/qdev-properties.h" #include "hw/i386/topology.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #ifndef CONFIG_USER_ONLY #include "confidential-guest.h" #include "monitor/hmp.h" diff --git a/target/i386/machine.c b/target/i386/machine.c index df0e0c178e..390ccfa3f8 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -7,7 +7,7 @@ #include "hw/i386/x86.h" #include "kvm/kvm_i386.h" #include "hw/xen/xen.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "system/kvm.h" #include "system/kvm_xen.h" #include "system/tcg.h" diff --git a/target/i386/tcg/system/bpt_helper.c b/target/i386/tcg/system/bpt_helper.c index 2feea69c8a..0ba2f01016 100644 --- a/target/i386/tcg/system/bpt_helper.c +++ b/target/i386/tcg/system/bpt_helper.c @@ -21,7 +21,7 @@ #include "accel/tcg/cpu-loop.h" #include "cpu.h" #include "exec/helper-proto.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "tcg/helper-tcg.h" diff --git a/target/ppc/cpu.c b/target/ppc/cpu.c index 36e1209119..7ff352b11b 100644 --- a/target/ppc/cpu.c +++ b/target/ppc/cpu.c @@ -22,7 +22,7 @@ #include "cpu-models.h" #include "cpu-qom.h" #include "exec/log.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "fpu/softfloat-helpers.h" #include "mmu-hash64.h" #include "helper_regs.h" diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index f404c7e549..9dd91ae95a 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -41,7 +41,7 @@ #include "disas/capstone.h" #include "fpu/softfloat.h" #include "exec/page-protection.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "helper_regs.h" #include "internal.h" #include "spr_common.h" diff --git a/target/riscv/debug.c b/target/riscv/debug.c index fa47b2724e..b8fea64bec 100644 --- a/target/riscv/debug.c +++ b/target/riscv/debug.c @@ -31,7 +31,7 @@ #include "target/riscv/debug.h" #include "trace.h" #include "exec/helper-proto.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "system/cpu-timers.h" #include "exec/icount.h" diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 1a2658eaf9..dabf8571cd 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -27,7 +27,6 @@ #include "system/memory.h" #include "system/runstate.h" #include "exec/target_page.h" -#include "exec/watchpoint.h" void s390x_tod_timer(void *opaque) { diff --git a/target/s390x/tcg/debug.c b/target/s390x/tcg/debug.c index d10e9ed892..7a838775ec 100644 --- a/target/s390x/tcg/debug.c +++ b/target/s390x/tcg/debug.c @@ -6,7 +6,6 @@ #include "qemu/osdep.h" #include "exec/breakpoint.h" -#include "exec/watchpoint.h" #include "accel/tcg/cpu-loop.h" #include "target/s390x/cpu.h" #include "target/s390x/s390x-internal.h" diff --git a/target/xtensa/dbg_helper.c b/target/xtensa/dbg_helper.c index 990012f60e..e180096b42 100644 --- a/target/xtensa/dbg_helper.c +++ b/target/xtensa/dbg_helper.c @@ -30,7 +30,7 @@ #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" -#include "exec/watchpoint.h" +#include "exec/breakpoint.h" #include "system/address-spaces.h" void HELPER(wsr_ibreakenable)(CPUXtensaState *env, uint32_t v) -- 2.43.0
