target/arm/kvm: Have kvm_arm_hw_debug_active take a ARMCPU argument

Unify the "kvm_arm.h" API: All functions related to ARM vCPUs
take a ARMCPU* argument. Use the CPU() QOM cast macro When
calling the generic vCPU API from "sysemu/kvm.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Gavin Shan <gshan@redhat.com>
Message-id: 20231123183518.64569-17-philmd@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-12-19 17:57:48 +00:00 committed by Peter Maydell
parent 39639275a1
commit 366bf10e11

View File

@ -1453,11 +1453,11 @@ int kvm_arch_process_async_events(CPUState *cs)
/** /**
* kvm_arm_hw_debug_active: * kvm_arm_hw_debug_active:
* @cs: CPU State * @cpu: ARMCPU
* *
* Return: TRUE if any hardware breakpoints in use. * Return: TRUE if any hardware breakpoints in use.
*/ */
static bool kvm_arm_hw_debug_active(CPUState *cs) static bool kvm_arm_hw_debug_active(ARMCPU *cpu)
{ {
return ((cur_hw_wps > 0) || (cur_hw_bps > 0)); return ((cur_hw_wps > 0) || (cur_hw_bps > 0));
} }
@ -1491,7 +1491,7 @@ void kvm_arch_update_guest_debug(CPUState *cs, struct kvm_guest_debug *dbg)
if (kvm_sw_breakpoints_active(cs)) { if (kvm_sw_breakpoints_active(cs)) {
dbg->control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP; dbg->control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_SW_BP;
} }
if (kvm_arm_hw_debug_active(cs)) { if (kvm_arm_hw_debug_active(ARM_CPU(cs))) {
dbg->control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_HW; dbg->control |= KVM_GUESTDBG_ENABLE | KVM_GUESTDBG_USE_HW;
kvm_arm_copy_hw_debug_data(&dbg->arch); kvm_arm_copy_hw_debug_data(&dbg->arch);
} }