From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yang Zhang Subject: [PATCH 2/3] VMX, apicv: Set "NMI-window exiting" for NMI Date: Thu, 12 Dec 2013 10:06:43 +0800 Message-ID: <1386814004-5574-3-git-send-email-yang.z.zhang@intel.com> References: <1386814004-5574-1-git-send-email-yang.z.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1386814004-5574-1-git-send-email-yang.z.zhang@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Yang Zhang , eddie.dong@intel.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org From: Yang Zhang Enable NMI-window exiting if interrupt is blocked by NMI under apicv enabled platform. Signed-off-by: Yang Zhang --- xen/arch/x86/hvm/vmx/intr.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 7757910..8507432 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -252,10 +252,11 @@ void vmx_intr_assist(void) intblk = hvm_interrupt_blocked(v, intack); if ( cpu_has_vmx_virtual_intr_delivery ) { - /* Set "Interrupt-window exiting" for ExtINT */ + /* Set "Interrupt-window exiting" for ExtINT and NMI. */ if ( (intblk != hvm_intblk_none) && - ( (intack.source == hvm_intsrc_pic) || - ( intack.source == hvm_intsrc_vector) ) ) + (intack.source == hvm_intsrc_pic || + intack.source == hvm_intsrc_vector || + intack.source == hvm_intsrc_nmi) ) { enable_intr_window(v, intack); goto out; -- 1.7.1