diff options
| author | Wanpeng Li <wanpengli@tencent.com> | 2020-07-31 11:12:19 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-07-31 03:20:15 -0400 |
| commit | d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1 (patch) | |
| tree | d32d8f9ff743ae542cbb7d527b9115bd2cea99af /arch/x86/kvm/lapic.c | |
| parent | d741dcae5562259841bd2211a0bd7e6c0f909f1e (diff) | |
| download | linux-stable-d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1.tar.gz linux-stable-d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1.tar.bz2 linux-stable-d2286ba7d574ba3103a421a2f9ec17cb5b0d87a1.zip | |
KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled
Prevent setting the tscdeadline timer if the lapic is hw disabled.
Fixes: bce87cce88 (KVM: x86: consolidate different ways to test for in-kernel LAPIC)
Cc: <stable@vger.kernel.org>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Message-Id: <1596165141-28874-1-git-send-email-wanpengli@tencent.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/lapic.c')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 5bf72fc86a8e..4ce2ddd26c0b 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2195,7 +2195,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; |