Changeset 52068 in vbox for trunk/src

Timestamp:

Jul 17, 2014 7:16:30 AM (11 years ago)

Author:

vboxsync

Message:

VMM/HMSVMR0: Convert NMIs to TRPM_TRAP and not TRPM_HARDWARE_INT.

File:

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

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

@@ -2372 +2372 @@
         switch (uVector)
         {
+            case X86_XCPT_NMI:
+            {
+                Event.n.u3Type = SVM_EVENT_NMI;
+                break;
+            }
+
             case X86_XCPT_PF:
             case X86_XCPT_DF:
@@ -2387 +2393 @@
     }
     else if (enmTrpmEvent == TRPM_HARDWARE_INT)
-    {
-        if (uVector == X86_XCPT_NMI)
-            Event.n.u3Type = SVM_EVENT_NMI;
-        else
-            Event.n.u3Type = SVM_EVENT_EXTERNAL_IRQ;
-    }
+        Event.n.u3Type = SVM_EVENT_EXTERNAL_IRQ;
     else if (enmTrpmEvent == TRPM_SOFTWARE_INT)
         Event.n.u3Type = SVM_EVENT_SOFTWARE_INT;
@@ -2430 +2431 @@
     {
         case SVM_EVENT_EXTERNAL_IRQ:
-        case SVM_EVENT_NMI:
            enmTrapType = TRPM_HARDWARE_INT;
            break;
@@ -2437 +2437 @@
             break;
         case SVM_EVENT_EXCEPTION:
+        case SVM_EVENT_NMI:
             enmTrapType = TRPM_TRAP;
             break;