On 7/10/26 15:15, Philippe Mathieu-Daudé via qemu development wrote:
On 10/7/26 22:53, Richard Henderson wrote:
Merge and name bp_wp_hit.  Now that all targets have been
converted to use debug_excp_handler hit argument, we only
need one pointer to an outstanding debug event.

Signed-off-by: Richard Henderson <[email protected]>
---
  include/hw/core/cpu.h  |  3 +--
  accel/tcg/cpu-exec.c   |  7 +++---
  accel/tcg/watchpoint.c |  4 ++--
  gdbstub/system.c       | 50 ++++++++++++++++++++++--------------------
  target/arm/hvf/hvf.c   |  5 ++---
  target/arm/kvm.c       |  2 +-
  target/i386/kvm/kvm.c  |  4 ++--
  target/ppc/kvm.c       |  2 +-
  target/s390x/kvm/kvm.c |  2 +-
  9 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 1a42940d92..5401d7c14b 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -526,8 +526,7 @@ struct CPUState {
      /* ice debug support */
      IntervalTreeRoot breakpoints;
      IntervalTreeRoot watchpoints;
-    CPUBreakpoint *breakpoint_hit;
-    CPUBreakpoint *watchpoint_hit;
+    CPUBreakpoint *bp_wp_hit;

During the last QEMU community call Alex said these fields are for
TCG, and this series confirms it (also this patch $subject).
I planned to move that to the TCG accelerator state at some point,
but then I'm confused by the uses in the hw accelerators...

They are not exclusively used by TCG.

All accelerators use bp_wp_hit, as that's what's used to communicate with gdbstub. WHPX uses cpu->breakpoints for some reason, unlike other native virtualization; I haven't looked into that closely.


r~

Reply via email to