1 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 2695a34fa1c5..337b6d2730fa 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -649,9 +649,10 @@ void kvm_hv_process_stimers(struct kvm_vcpu *vcpu)
                                 }
 
                                 if ((stimer->config & HV_STIMER_ENABLE) &&
-                                    stimer->count)
-                                        stimer_start(stimer);
-                                else
+                                    stimer->count) {
+                                        if (!stimer->msg_pending)
+                                                stimer_start(stimer);
+                                } else
                                         stimer_cleanup(stimer);
                         }
                 }