1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 5c2c6e71abf2..eeecadf5da46 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -2151,7 +2151,9 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)
 {
         u32 idtv_info_field, intr_info_field;
         int has_ext_irq, interrupt_window_open;
+        int vector;
 
+        kvm_inject_pending_timer_irqs(vcpu);
         update_tpr_threshold(vcpu);
 
         has_ext_irq = kvm_cpu_has_interrupt(vcpu);
@@ -2183,9 +2185,11 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)
         interrupt_window_open =
                 ((vmcs_readl(GUEST_RFLAGS) & X86_EFLAGS_IF) &&
                  (vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & 3) == 0);
-        if (interrupt_window_open)
-                vmx_inject_irq(vcpu, kvm_cpu_get_interrupt(vcpu));
-        else
+        if (interrupt_window_open) {
+                vector = kvm_cpu_get_interrupt(vcpu);
+                vmx_inject_irq(vcpu, vector);
+                kvm_timer_intr_post(vcpu, vector);
+        } else
                 enable_irq_window(vcpu);
 }