From b67be03e3ac9d20a258f24dcaf1b61c91c1306f5 Mon Sep 17 00:00:00 2001 From: Anton Johansson Date: Mon, 7 Aug 2023 17:56:58 +0200 Subject: [PATCH] accel/kvm: Widen pc/saved_insn for kvm_sw_breakpoint Widens the pc and saved_insn fields of kvm_sw_breakpoint from target_ulong to vaddr. The pc argument of kvm_find_sw_breakpoint is also widened to match. Signed-off-by: Anton Johansson Reviewed-by: Richard Henderson Message-Id: <20230807155706.9580-2-anjo@rev.ng> Signed-off-by: Richard Henderson --- accel/kvm/kvm-all.c | 3 +-- include/sysemu/kvm.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index d07f1ecbd3..2ba7521695 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3309,8 +3309,7 @@ bool kvm_arm_supports_user_irq(void) } #ifdef KVM_CAP_SET_GUEST_DEBUG -struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, - target_ulong pc) +struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, vaddr pc) { struct kvm_sw_breakpoint *bp; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index ccaf55caf7..407fe183cc 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -413,14 +413,14 @@ struct kvm_guest_debug; struct kvm_debug_exit_arch; struct kvm_sw_breakpoint { - target_ulong pc; - target_ulong saved_insn; + vaddr pc; + vaddr saved_insn; int use_count; QTAILQ_ENTRY(kvm_sw_breakpoint) entry; }; struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUState *cpu, - target_ulong pc); + vaddr pc); int kvm_sw_breakpoints_active(CPUState *cpu); -- 2.30.2