From a439dc4025dc6c4d0a39e47a537fd8459470fe24 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 23 Nov 2008 18:08:57 +0200 Subject: [PATCH] --- yaml --- r: 125245 b: refs/heads/master c: df203ec9a77a7236cb90456664d714423b98a977 h: refs/heads/master i: 125243: 226ff6207ac4140f5e40355ef02d4de722acf030 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6cd9047b8720..19bf18a68533 100644 --- 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 index f5958a7823f4..7ea485543cf8 100644 --- 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); } }