diff -r e6f751ed8e38 xen/arch/x86/hvm/svm/intr.c --- a/xen/arch/x86/hvm/svm/intr.c Tue Mar 09 10:00:37 2010 +0000 +++ b/xen/arch/x86/hvm/svm/intr.c Fri May 07 16:15:58 2010 +0200 @@ -92,6 +92,10 @@ static void enable_intr_window(struct vc * track 'NMI blocking' from NMI injection until IRET. This can be done * quite easily in software by intercepting the unblocking IRET. */ + + if ( vmcb->general1_intercepts & GENERAL1_INTERCEPT_IRET ) + return; + intr = vmcb->vintr; intr.fields.irq = 1; intr.fields.vector = 0;