Commit 4cefbec9 authored by Oliver Upton's avatar Oliver Upton Committed by Marc Zyngier
Browse files

KVM: arm64: Clean up KVM_SET_GUEST_DEBUG handler 



No particular reason other than it isn't nice to look at.

Tested-by: default avatarJames Clark <james.clark@linaro.org>
Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20241219224116.3941496-8-oliver.upton@linux.dev


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent cd9b1010

arch/arm64/kvm/guest.c

+11 −18
Original line number Diff line number Diff line
@@ -917,31 +917,24 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,

					struct kvm_guest_debug *dbg)

{

	int ret = 0;



	trace_kvm_set_guest_debug(vcpu, dbg->control);



	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK) {

		ret = -EINVAL;

		goto out;

	if (dbg->control & ~KVM_GUESTDBG_VALID_MASK)

		return -EINVAL;



	if (!(dbg->control & KVM_GUESTDBG_ENABLE)) {

		vcpu->guest_debug = 0;

		vcpu_clear_flag(vcpu, DBG_SS_ACTIVE_PENDING);

		return 0;

	}



	if (dbg->control & KVM_GUESTDBG_ENABLE) {

	vcpu->guest_debug = dbg->control;



	/* Hardware assisted Break and Watch points */

		if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW) {

	if (vcpu->guest_debug & KVM_GUESTDBG_USE_HW)

		vcpu->arch.external_debug_state = dbg->arch;

		}



	} else {

		/* If not enabled clear all flags */

		vcpu->guest_debug = 0;

		vcpu_clear_flag(vcpu, DBG_SS_ACTIVE_PENDING);

	}



out:

	return ret;

	return 0;

}



int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu,