]> xenbits.xensource.com Git - people/aperard/xen-arm.git/commitdiff
nested vmx: enable NMI-window exiting for L1 VMM
authorDongxiao Xu <dongxiao.xu@intel.com>
Fri, 30 Nov 2012 09:22:51 +0000 (09:22 +0000)
committerDongxiao Xu <dongxiao.xu@intel.com>
Fri, 30 Nov 2012 09:22:51 +0000 (09:22 +0000)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Acked-by: Jun Nakajima <jun.nakajima@intel.com>
Committed-by: Keir Fraser <keir@xen.org>
xen/arch/x86/hvm/vmx/vvmx.c

index c9532781cd07c8491337fe9921da7ee380b24e67..8f75bf44cf591f7e8dde6db2d27825ed35f2b466 100644 (file)
@@ -1273,7 +1273,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content)
                CPU_BASED_USE_TSC_OFFSETING |
                CPU_BASED_UNCOND_IO_EXITING |
                CPU_BASED_RDTSC_EXITING |
-               CPU_BASED_MONITOR_TRAP_FLAG;
+               CPU_BASED_MONITOR_TRAP_FLAG |
+               CPU_BASED_VIRTUAL_NMI_PENDING;
         /* bit 1, 4-6,8,13-16,26 must be 1 (refer G4 of SDM) */
         tmp = ( (1<<26) | (0xf << 13) | 0x100 | (0x7 << 4) | 0x2);
         /* 0-settings */