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

KVM: SVM: tweak warning about enabled AVIC on nested entry 



It is possible that AVIC was requested to be disabled but
not yet disabled, e.g if the nested entry is done right
after svm_vcpu_after_set_cpuid.

Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20210713142023.106183-3-mlevitsk@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent f1577ab2

arch/x86/kvm/svm/nested.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -515,7 +515,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_svm *svm) 
	 * Also covers avic_vapic_bar, avic_backing_page, avic_logical_id,

	 * Also covers avic_vapic_bar, avic_backing_page, avic_logical_id,

	 * avic_physical_id.

	 * avic_physical_id.

	 */

	 */

	WARN_ON(svm->vmcb01.ptr->control.int_ctl & AVIC_ENABLE_MASK);

	WARN_ON(kvm_apicv_activated(svm->vcpu.kvm));





	/* Copied from vmcb01.  msrpm_base can be overwritten later.  */

	/* Copied from vmcb01.  msrpm_base can be overwritten later.  */

	svm->vmcb->control.nested_ctl = svm->vmcb01.ptr->control.nested_ctl;

	svm->vmcb->control.nested_ctl = svm->vmcb01.ptr->control.nested_ctl;