From: Liran Alon <liran.alon@oracle.com>
Date: Mon, 11 Nov 2019 12:26:21 +0000 (+0200)
Subject: KVM: SVM: Remove check if APICv enabled in SVM update_cr8_intercept() handler
X-Git-Tag: v5.5-rc1~182^2~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=49d654d85f857d9ca34fe2b4ac6d6cf34677e6c1;p=thirdparty%2Fkernel%2Flinux.git

KVM: SVM: Remove check if APICv enabled in SVM update_cr8_intercept() handler

This check is unnecessary as x86 update_cr8_intercept() which calls
this VMX/SVM specific callback already performs this check.

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Liran Alon <liran.alon@oracle.com>
Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index a7b358f20aca0..d02a73a48461f 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -5106,8 +5106,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
 {
 	struct vcpu_svm *svm = to_svm(vcpu);
 
-	if (svm_nested_virtualize_tpr(vcpu) ||
-	    kvm_vcpu_apicv_active(vcpu))
+	if (svm_nested_virtualize_tpr(vcpu))
 		return;
 
 	clr_cr_intercept(svm, INTERCEPT_CR8_WRITE);