]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
KVM: x86: handle 0 write to TSC_DEADLINE MSR
authorRadim Krčmář <rkrcmar@redhat.com>
Fri, 6 Oct 2017 17:25:53 +0000 (19:25 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 12 Oct 2017 12:01:53 +0000 (14:01 +0200)
0 should disable the timer, but start_hv_timer will recognize it as an
expired timer instead.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Reviewed-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/lapic.c

index 2c9e88a82738d718a90fa6e97f51648b1e86d2e3..39c1ae11ce1d98c86d0fc798c2c7ec49781bae45 100644 (file)
@@ -1549,6 +1549,9 @@ static bool start_hv_timer(struct kvm_lapic *apic)
        if (!apic_lvtt_period(apic) && atomic_read(&ktimer->pending))
                return false;
 
+       if (!ktimer->tscdeadline)
+               return false;
+
        r = kvm_x86_ops->set_hv_timer(apic->vcpu, ktimer->tscdeadline);
        if (r < 0)
                return false;