---

yaml --- r: 125245 b: refs/heads/master c: df203ec h: refs/heads/master i: 125243: 226ff62 v: v3
git-mirror · Dec 31, 2008 · a439dc4 · a439dc4
1 parent df2f1c5
commit a439dc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fe0736763a07fbea56213ea105a0c2ee098e6fc
+refs/heads/master: df203ec9a77a7236cb90456664d714423b98a977
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
@@ -3304,6 +3304,8 @@ static void vmx_intr_assist(struct kvm_vcpu *vcpu)
 	if (vcpu->arch.interrupt.pending) {
 		vmx_inject_irq(vcpu, vcpu->arch.interrupt.nr);
 		kvm_timer_intr_post(vcpu, vcpu->arch.interrupt.nr);
+		if (kvm_cpu_has_interrupt(vcpu))
+			enable_irq_window(vcpu);
 	}
 }