[Xen-changelog] [xen master] Nested VMX: Force check ISR when L2 is running

[patchbot@xxxxxxx]

commit b35d0a26983843c092bfa353fd6b9aa8c3bf4886
Author:     Yang Zhang <yang.z.zhang@xxxxxxxxx>
AuthorDate: Thu Aug 22 10:50:13 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Aug 22 10:50:13 2013 +0200

    Nested VMX: Force check ISR when L2 is running
    
    External interrupt is allowed to notify CPU only when it has higher
    priority than current in servicing interrupt. With APIC-v, the priority
    comparing is done by hardware and hardware will inject the interrupt to
    VCPU when it recognizes an interrupt. Currently, there is no virtual
    APIC-v feature available for L1 to use, so when L2 is running, we still need
    to compare interrupt priority with ISR in hypervisor instead via hardware.
    
    Signed-off-by: Yang Zhang <yang.z.zhang@xxxxxxxxx>
    Acked-by: "Dong, Eddie" <eddie.dong@xxxxxxxxx>
---
 xen/arch/x86/hvm/vlapic.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 7a154f9..f1530fd 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -37,6 +37,7 @@
 #include <asm/hvm/io.h>
 #include <asm/hvm/support.h>
 #include <asm/hvm/vmx/vmx.h>
+#include <asm/hvm/nestedhvm.h>
 #include <public/hvm/ioreq.h>
 #include <public/hvm/params.h>
 
@@ -1037,7 +1038,8 @@ int vlapic_has_pending_irq(struct vcpu *v)
     if ( irr == -1 )
         return -1;
 
-    if ( vlapic_virtual_intr_delivery_enabled() )
+    if ( vlapic_virtual_intr_delivery_enabled() &&
+         !nestedhvm_vcpu_in_guestmode(v) )
         return irr;
 
     isr = vlapic_find_highest_isr(vlapic);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog