Changeset 52067 in vbox

Timestamp:

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

Author:

vboxsync

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

95069

Message:

VMM/HMVMXR0: Convert NMIs to TRPM as TRPM_TRAP and not TRPM_HARDWARE_INT.

File:

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

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

@@ -6848 +6848 @@
         switch (uVector)
         {
+            case X86_XCPT_NMI:
+                u32IntInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+                break;
+
             case X86_XCPT_BP:
             case X86_XCPT_OF:
@@ -6869 +6873 @@
     else if (enmTrpmEvent == TRPM_HARDWARE_INT)
     {
-        if (uVector == X86_XCPT_NMI)
-            u32IntInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
-        else
-        {
-            uint32_t uEFlags = CPUMGetGuestEFlags(pVCpu);
-            if (!(uEFlags & X86_EFL_IF))
-                return VERR_VMX_IPE_5;
-            u32IntInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
-        }
+        /** @todo r=ramshankar: Make this a strict-build assert after this bug is
+         *        fixed. See @bugref{7317}. */
+        uint32_t uEFlags = CPUMGetGuestEFlags(pVCpu);
+        if (!(uEFlags & X86_EFL_IF))
+        {
+            Log4(("hmR0VmxTrpmTrapToPendingEvent: TRPM injecting an external interrupt when interrupts are disabled!?!"));
+            return VERR_VMX_IPE_5;
+        }
+
+        u32IntInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
     }
     else if (enmTrpmEvent == TRPM_SOFTWARE_INT)
@@ -6917 +6922 @@
     {
         case VMX_IDT_VECTORING_INFO_TYPE_EXT_INT:
-        case VMX_IDT_VECTORING_INFO_TYPE_NMI:
            enmTrapType = TRPM_HARDWARE_INT;
            break;
@@ -6925 +6929 @@
             break;
 
+        case VMX_IDT_VECTORING_INFO_TYPE_NMI:
         case VMX_IDT_VECTORING_INFO_TYPE_PRIV_SW_XCPT:
         case VMX_IDT_VECTORING_INFO_TYPE_SW_XCPT:      /* #BP and #OF */