Changeset 52072 in vbox for trunk/src

Timestamp:

Jul 17, 2014 11:28:01 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Fix NMI injection.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -5822 +5822 @@
                     enmReflect = VMXREFLECTXCPT_TF;
             }
-            else if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI
-                     && (pVCpu->hm.s.vmx.u32PinCtls & VMX_VMCS_CTRL_PIN_EXEC_VIRTUAL_NMI))
+            else if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
+                     || uIntType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
+                     || uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
+            {
+                /*
+                 * Ignore software interrupts (INT n), software exceptions (#BP, #OF) and
+                 * privileged software exception (#DB from ICEBP) as they reoccur when restarting the instruction.
+                 */
+                enmReflect = VMXREFLECTXCPT_XCPT;
+            }
+        }
+        else
+        {
+            /*
+             * If event delivery caused an EPT violation/misconfig or APIC access VM-exit, then the VM-exit
+             * interruption-information will not be valid and we end up here. In such cases, it is sufficient to reflect the
+             * original exception to the guest after handling the VM-exit.
+             */
+            if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI
+                && (pVCpu->hm.s.vmx.u32PinCtls & VMX_VMCS_CTRL_PIN_EXEC_VIRTUAL_NMI))
             {
                 /*
@@ -5837 +5855 @@
                      || uIntType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
                      || uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
-            {
-                /*
-                 * Ignore software interrupts (INT n), software exceptions (#BP, #OF) and
-                 * privileged software exception (#DB from ICEBP) as they reoccur when restarting the instruction.
-                 */
-                enmReflect = VMXREFLECTXCPT_XCPT;
-            }
-        }
-        else
-        {
-            /*
-             * If event delivery caused an EPT violation/misconfig or APIC access VM-exit, then the VM-exit
-             * interruption-information will not be valid and we end up here. In such cases, it is sufficient to reflect the
-             * original exception to the guest after handling the VM-exit.
-             */
-            if (   uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT
-                || uIntType == VMX_IDT_VECTORING_INFO_TYPE_EXT_INT
-                || uIntType == VMX_IDT_VECTORING_INFO_TYPE_NMI)
             {
                 enmReflect = VMXREFLECTXCPT_XCPT;