| Message ID | 20231123183518.64569-17-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/arm/kvm: Unify kvm_arm_FOO() API | expand |
Hi Phil, On 11/24/23 05:35, Philippe Mathieu-Daudé wrote: > 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> > --- > target/arm/kvm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > With the following comments addressed: Reviewed-by: Gavin Shan <gshan@redhat.com> > diff --git a/target/arm/kvm.c b/target/arm/kvm.c > index 1f6da5529f..cbfea689cc 100644 > --- a/target/arm/kvm.c > +++ b/target/arm/kvm.c > @@ -1455,11 +1455,11 @@ int kvm_arch_process_async_events(CPUState *cs) > > /** > * kvm_arm_hw_debug_active: > - * @cs: CPU State > + * @cpu: ARMCPU > * > * 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)); > } Either @cs or @cpu isn't dereferenced in kvm_arm_hw_debug_active(). So I guess the argument can be simply droped? > @@ -1493,7 +1493,7 @@ void kvm_arch_update_guest_debug(CPUState *cs, struct kvm_guest_debug *dbg) > if (kvm_sw_breakpoints_active(cs)) { > 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; > kvm_arm_copy_hw_debug_data(&dbg->arch); > } Thanks, Gavin
diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 1f6da5529f..cbfea689cc 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -1455,11 +1455,11 @@ int kvm_arch_process_async_events(CPUState *cs) /** * kvm_arm_hw_debug_active: - * @cs: CPU State + * @cpu: ARMCPU * * 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)); } @@ -1493,7 +1493,7 @@ void kvm_arch_update_guest_debug(CPUState *cs, struct kvm_guest_debug *dbg) if (kvm_sw_breakpoints_active(cs)) { 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; kvm_arm_copy_hw_debug_data(&dbg->arch); }
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> --- target/arm/kvm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)