Changeset 20838 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jun 23, 2009 2:15:46 PM (16 years ago)

Author:

vboxsync

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

48977

Message:

NMI updates

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HWSVMR0.cpp (modified) (2 diffs)
• HWVMXR0.cpp (modified) (2 diffs)

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

@@ -426 +426 @@
     }
 
-    if (pVM->hwaccm.s.fInjectNMI)
+    if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
     {
         SVM_EVENT Event;
 
+        Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
         Event.n.u8Vector     = X86_XCPT_NMI;
         Event.n.u1Valid      = 1;
@@ -436 +437 @@
 
         SVMR0InjectEvent(pVCpu, pVMCB, pCtx, &Event);
-        pVM->hwaccm.s.fInjectNMI = false;
         return VINF_SUCCESS;
     }
+
+    /* @todo SMI interrupts. */
 
     /* When external interrupts are pending, we should exit the VM when IF is set. */

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

@@ -754 +754 @@
     }
 
-    if (pVM->hwaccm.s.fInjectNMI)
+    if (VMCPU_FF_TESTANDCLEAR(pVCpu, VMCPU_FF_INTERRUPT_NMI_BIT))
     {
         RTGCUINTPTR intInfo;
+
+        Log(("CPU%d: injecting #NMI\n", pVCpu->idCpu));
 
         intInfo  = X86_XCPT_NMI;
@@ -765 +767 @@
         AssertRC(rc);
 
-        pVM->hwaccm.s.fInjectNMI = false;
         return VINF_SUCCESS;
     }
+
+    /* @todo SMI interrupts. */
 
     /* When external interrupts are pending, we should exit the VM when IF is set. */