diff mbox series

[18/28] KVM: nSVM: remove unnecessary if

Message ID	20200526172308.111575-19-pbonzini@redhat.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=g4lY=7I=vger.kernel.org=kvm-owner@kernel.org> From: Paolo Bonzini <pbonzini@redhat.com> To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: vkuznets@redhat.com, mlevitsk@redhat.com, Sean Christopherson <sean.j.christopherson@intel.com>, Jim Mattson <jmattson@google.com> Subject: [PATCH 18/28] KVM: nSVM: remove unnecessary if Date: Tue, 26 May 2020 13:22:58 -0400 Message-Id: <20200526172308.111575-19-pbonzini@redhat.com> In-Reply-To: <20200526172308.111575-1-pbonzini@redhat.com> References: <20200526172308.111575-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	KVM: nSVM: event fixes and migration support \| expand [v2,00/28] KVM: nSVM: event fixes and migration support [01/28] KVM: x86: track manually whether an event has been injected [02/28] KVM: x86: enable event window in inject_pending_event [03/28] KVM: nSVM: inject exceptions via svm_check_nested_events [04/28] KVM: nSVM: remove exit_required [05/28] KVM: nSVM: correctly inject INIT vmexits [06/28] KVM: SVM: always update CR3 in VMCB [07/28] KVM: nVMX: always update CR3 in VMCS [08/28] KVM: nSVM: move map argument out of enter_svm_guest_mode [09/28] KVM: nSVM: extract load_nested_vmcb_control [10/28] KVM: nSVM: extract preparation of VMCB for nested run [11/28] KVM: nSVM: move MMU setup to nested_prepare_vmcb_control [12/28] KVM: nSVM: clean up tsc_offset update [13/28] KVM: nSVM: pass vmcb_control_area to copy_vmcb_control_area [14/28] KVM: nSVM: remove trailing padding for struct vmcb_control_area [15/28] KVM: nSVM: save all control fields in svm->nested [16/28] KVM: nSVM: restore clobbered INT_CTL fields after clearing VINTR [17/28] KVM: nSVM: synchronize VMCB controls updated by the processor on every vmexit [18/28] KVM: nSVM: remove unnecessary if [19/28] KVM: nSVM: extract svm_set_gif [20/28] KVM: SVM: preserve VGIF across VMCB switch [21/28] KVM: nSVM: synthesize correct EXITINTINFO on vmexit [22/28] KVM: nSVM: remove HF_VINTR_MASK [23/28] KVM: nSVM: remove HF_HIF_MASK [24/28] KVM: nSVM: split nested_vmcb_check_controls [25/28] KVM: nSVM: leave guest mode when clearing EFER.SVME [26/28] KVM: MMU: pass arbitrary CR0/CR4/EFER to kvm_init_shadow_mmu [27/28] selftests: kvm: add a SVM version of state-test [28/28] KVM: nSVM: implement KVM_GET_NESTED_STATE and KVM_SET_NESTED_STATE

Commit Message

Paolo Bonzini May 26, 2020, 5:22 p.m. UTC

kvm_vcpu_apicv_active must be false when nested virtualization is enabled,
so there is no need to check it in clgi_interception.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/svm/svm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index 97dbd6f65831..0654c5672b1a 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -2015,8 +2015,7 @@  static int clgi_interception(struct vcpu_svm *svm)
 	disable_gif(svm);
 
 	/* After a CLGI no interrupts should come */
-	if (!kvm_vcpu_apicv_active(&svm->vcpu))
-		svm_clear_vintr(svm);
+	svm_clear_vintr(svm);
 
 	return ret;
 }