Changeset 14109 in vbox for trunk/src/VBox

Timestamp:

Nov 11, 2008 7:39:53 PM (16 years ago)

Author:

vboxsync

Message:

Implemented NMI injection.

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1085 +1085 @@
 VMMR3DECL(int)  HWACCMR3InjectNMI(PVM pVM)
 {
+    pVM->hwaccm.s.fInjectNMI = true;
     return VINF_SUCCESS;
 }

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -186 +186 @@
     bool                        fAllowNestedPaging;
 
+    /** Set if we're supposed to inject an NMI. */
+    bool                        fInjectNMI;
+
     /** Explicit alignment padding to make 32-bit gcc align u64RegisterMask
      *  naturally. */
-    bool                        padding[2];
+    bool                        padding[1];
 
     /** And mask for copying register contents. */

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

@@ -413 +413 @@
     }
 
+    if (pVM->hwaccm.s.fInjectNMI)
+    {
+        SVM_EVENT Event;
+
+        Event.n.u8Vector     = X86_XCPT_NMI;
+        Event.n.u1Valid      = 1;
+        Event.n.u32ErrorCode = 0;
+        Event.n.u3Type       = SVM_EVENT_NMI;
+
+        SVMR0InjectEvent(pVM, pVMCB, pCtx, &Event);
+        pVM->hwaccm.s.fInjectNMI = false;
+        return VINF_SUCCESS;
+    }
+
     /* When external interrupts are pending, we should exit the VM when IF is set. */
     if (    !TRPMHasTrap(pVM)

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

@@ -662 +662 @@
 
         pVCpu->hwaccm.s.Event.fPending = false;
+        return VINF_SUCCESS;
+    }
+
+    if (pVM->hwaccm.s.fInjectNMI)
+    {
+        RTGCUINTPTR intInfo;
+
+        intInfo  = X86_XCPT_NMI;
+        intInfo |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
+        intInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_NMI << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
+
+        rc = VMXR0InjectEvent(pVM, pVCpu, pCtx, intInfo, 0, errCode);
+        AssertRC(rc);
+
+        pVM->hwaccm.s.fInjectNMI = false;
         return VINF_SUCCESS;
     }