Commit fa18aca9 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: aarch64: implement KVM_CAP_SET_GUEST_DEBUG2 



Move KVM_GUESTDBG_VALID_MASK to kvm_host.h
and use it to return the value of this capability.
Compile tested only.

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210401135451.1004564-5-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7e582ccb

arch/arm64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -401,6 +401,10 @@ struct kvm_vcpu_arch { 
#define KVM_ARM64_PENDING_EXCEPTION	(1 << 8) /* Exception pending */

#define KVM_ARM64_EXCEPT_MASK		(7 << 9) /* Target EL/MODE */



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE | \

				 KVM_GUESTDBG_USE_SW_BP | \

				 KVM_GUESTDBG_USE_HW | \

				 KVM_GUESTDBG_SINGLESTEP)

/*

 * When KVM_ARM64_PENDING_EXCEPTION is set, KVM_ARM64_EXCEPT_MASK can

 * take the following values:

arch/arm64/kvm/arm.c

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
	case KVM_CAP_VCPU_ATTRIBUTES:

		r = 1;

		break;

	case KVM_CAP_SET_GUEST_DEBUG2:

		return KVM_GUESTDBG_VALID_MASK;

	case KVM_CAP_ARM_SET_DEVICE_ADDR:

		r = 1;

		break;

arch/arm64/kvm/guest.c

+0 −5
Original line number Diff line number Diff line
@@ -888,11 +888,6 @@ int kvm_arch_vcpu_ioctl_translate(struct kvm_vcpu *vcpu, 
	return -EINVAL;

}



#define KVM_GUESTDBG_VALID_MASK (KVM_GUESTDBG_ENABLE |    \

			    KVM_GUESTDBG_USE_SW_BP | \

			    KVM_GUESTDBG_USE_HW | \

			    KVM_GUESTDBG_SINGLESTEP)



/**

 * kvm_arch_vcpu_ioctl_set_guest_debug - set up guest debugging

 * @kvm:	pointer to the KVM struct