From: cegger <none@none>
Date: Mon, 28 Feb 2011 11:21:57 +0000 (+0100)
Subject: Handle interrupts (generic part)
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10533
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5120a76fad77858d2ac2cbcce8a3dd3500d25e87;p=xen.git

Handle interrupts (generic part)

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
Acked-by: Tim Deegan <Tim.Deegan@citrix.com>
Committed-by: Tim Deegan <Tim.Deegan@citrix.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index c4b3a4591e..cbae82c7a1 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -2555,6 +2555,14 @@ enum hvm_intblk hvm_interrupt_blocked(struct vcpu *v, struct hvm_intack intack)
 
     ASSERT(v == current);
 
+    if ( nestedhvm_enabled(v->domain) ) {
+        enum hvm_intblk intr;
+
+        intr = nhvm_interrupt_blocked(v);
+        if ( intr != hvm_intblk_none )
+            return intr;
+    }
+
     if ( (intack.source != hvm_intsrc_nmi) &&
          !(guest_cpu_user_regs()->eflags & X86_EFLAGS_IF) )
         return hvm_intblk_rflags_ie;