Changeset 52041 in vbox for trunk/include/VBox/vmm

Timestamp:

Jul 15, 2014 3:43:30 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95034

Message:

VMM: Fix NMI handling.

Location:

trunk/include/VBox/vmm

Files:

• hm_vmx.h (modified) (2 diffs)
• vm.h (modified) (1 diff)

trunk/include/VBox/vmm/hm_vmx.h

@@ -1351 +1351 @@
 /** Use TPR shadow. */
 #define VMX_VMCS_CTRL_PROC_EXEC_USE_TPR_SHADOW                  RT_BIT(21)
-/** VM-exit when virtual nmi blocking is disabled. */
+/** VM-exit when virtual NMI blocking is disabled. */
 #define VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT                 RT_BIT(22)
 /** VM-exit when executing a MOV DRx instruction. */
@@ -1489 +1489 @@
 #define VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID               RT_BIT(11)
 #define VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_IS_VALID(a)         RT_BOOL((a) & VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID)
-#define VMX_EXIT_INTERRUPTION_INFO_NMI_UNBLOCK(a)                 ((a) & RT_BIT(12))
+#define VMX_EXIT_INTERRUPTION_INFO_NMI_UNBLOCK_IRET(a)            ((a) & RT_BIT(12))
 #define VMX_EXIT_INTERRUPTION_INFO_VALID                          RT_BIT(31)
 #define VMX_EXIT_INTERRUPTION_INFO_IS_VALID(a)                    RT_BOOL((a) & RT_BIT(31))

trunk/include/VBox/vmm/vm.h

@@ -405 +405 @@
 /** Inhibit interrupts pending. See EMGetInhibitInterruptsPC(). */
 #define VMCPU_FF_INHIBIT_INTERRUPTS         RT_BIT_32(24)
+/** Inhibit non-maskable interrupts. */
+#define VMCPU_FF_INHIBIT_NMIS               RT_BIT_32(25)
 #ifdef VBOX_WITH_RAW_MODE
 /** CSAM needs to scan the page that's being executed */