Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01ac46c6 authored by Wanpeng Li's avatar Wanpeng Li Committed by Greg Kroah-Hartman
Browse files

KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled 



commit d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1 upstream.

Prevent setting the tscdeadline timer if the lapic is hw disabled.

Fixes: bce87cce (KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarWanpeng Li <wanpengli@tencent.com>
Message-Id: <1596165141-28874-1-git-send-email-wanpengli@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd412846

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -2085,7 +2085,7 @@ void kvm_set_lapic_tscdeadline_msr(struct kvm_vcpu *vcpu, u64 data) 
{

	struct kvm_lapic *apic = vcpu->arch.apic;



	if (!lapic_in_kernel(vcpu) || apic_lvtt_oneshot(apic) ||

	if (!kvm_apic_present(vcpu) || apic_lvtt_oneshot(apic) ||

			apic_lvtt_period(apic))

		return;