Changeset 19611 in vbox for trunk/src/VBox

Timestamp:

May 12, 2009 12:23:08 PM (16 years ago)

Author:

vboxsync

Message:

Change the EM state to EMSTATE_HALTED after receiving the startup IPI.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VMM.cpp (modified) (1 diff)
• VMMAll/EMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -2744 +2744 @@
  * execution loop (the outer loop being in EMR3ExecuteVM()).
  *
- * @returns VBox status code. The most important ones are: VINF_EM_RESCHEDULE,
+ * @returns VBox status code. The most important ones are: ,
  *          VINF_EM_RESCHEDULE_REM, VINF_EM_SUSPEND, VINF_EM_RESET and VINF_EM_TERMINATE.
  *

trunk/src/VBox/VMM/VMM.cpp

@@ -1173 +1173 @@
 
 # if 1 /* If we keep the EMSTATE_WAIT_SIPI method, then move this to EM.cpp. */
+    EMSetState(pVCpu, EMSTATE_HALTED);
     return VINF_EM_RESCHEDULE;
 # else /* And if we go the VMCPU::enmState way it can stay here. */

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -85 +85 @@
  *
  * @returns Current status.
+ * @param   pVCpu         The VMCPU to operate on.
  */
 VMMDECL(EMSTATE) EMGetState(PVMCPU pVCpu)
@@ -90 +91 @@
     return pVCpu->em.s.enmState;
 }
+
+/**
+ * Sets the current execution manager status. (use only when you know what you're doing!)
+ *
+ * @param   pVCpu         The VMCPU to operate on.
+ */
+VMMDECL(void)    EMSetState(PVMCPU pVCpu, EMSTATE enmNewState)
+{
+    /* Only allowed combination: */
+    Assert(pVCpu->em.s.enmState == EMSTATE_WAIT_SIPI && enmNewState == EMSTATE_HALTED);
+    pVCpu->em.s.enmState = enmNewState;
+}
+
 
 #ifndef IN_RC