KVM: SVM: Merge svm_enable_vintr into svm_set_vintr (e14b7786) · Commits · 戴 / test

Code clean up and remove unnecessary intercept check for INTERCEPT_VINTR. Signed-off-by:

Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> Message-Id: <1588771076-73790-4-git-send-email-suravee.suthikulpanit@amd.com> Signed-off-by:

arch/x86/kvm/svm/svm.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -1352,12 +1352,13 @@ static void svm_cache_reg(struct kvm_vcpu *vcpu, enum kvm_reg reg)
		}
		}

		static inline void svm_enable_vintr(struct vcpu_svm *svm)
		static void svm_set_vintr(struct vcpu_svm *svm)
		{
		struct vmcb_control_area *control;

		/* The following fields are ignored when AVIC is enabled */
		WARN_ON(kvm_vcpu_apicv_active(&svm->vcpu));
		set_intercept(svm, INTERCEPT_VINTR);

		/*
		* This is just a dummy VINTR to actually cause a vmexit to happen.
		@@ -1371,13 +1372,6 @@ static inline void svm_enable_vintr(struct vcpu_svm *svm)
		mark_dirty(svm->vmcb, VMCB_INTR);
		}

		static void svm_set_vintr(struct vcpu_svm *svm)
		{
		set_intercept(svm, INTERCEPT_VINTR);
		if (is_intercept(svm, INTERCEPT_VINTR))
		svm_enable_vintr(svm);
		}

		static void svm_clear_vintr(struct vcpu_svm *svm)
		{
		clr_intercept(svm, INTERCEPT_VINTR);