Message ID | 20171006172555.30087-2-rkrcmar@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
2017-10-07 1:25 GMT+08:00 Radim Krčmář <rkrcmar@redhat.com>: > 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> > --- > arch/x86/kvm/lapic.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c > index 2c9e88a82738..39c1ae11ce1d 100644 > --- a/arch/x86/kvm/lapic.c > +++ b/arch/x86/kvm/lapic.c > @@ -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; > -- > 2.14.2 >
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 2c9e88a82738..39c1ae11ce1d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -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;
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> --- arch/x86/kvm/lapic.c | 3 +++ 1 file changed, 3 insertions(+)