Changeset 23145 in vbox for trunk/src/VBox/VMM/VMEmt.cpp

Timestamp:

Sep 18, 2009 8:58:30 PM (15 years ago)

Author:

vboxsync

Message:

VMM: Extended VMMR3EmtRendezvous with TYPE_ASCENDING, TYPE_DESCENDING and STOP_ON_ERROR for use with VM state changes. The return type of the callback was changed so that the callback can feed scheduling info to EM.

File:

• trunk/src/VBox/VMM/VMEmt.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMEmt.cpp

@@ -158 +158 @@
                 break;
             }
+
             if (VM_FF_ISPENDING(pVM, VM_FF_EMT_RENDEZVOUS))
-                VMMR3EmtRendezvousFF(pVM, &pVM->aCpus[idCpu]);
-            if (pUVM->vm.s.pReqs)
+            {
+                rc = VMMR3EmtRendezvousFF(pVM, &pVM->aCpus[idCpu]);
+                Log(("vmR3EmulationThread: Rendezvous rc=%Rrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
+            }
+            else if (pUVM->vm.s.pReqs)
             {
                 /*
@@ -1099 +1103 @@
  * Rendezvous callback that will be called once.
  *
- * @returns VBox status code.
+ * @returns VBox strict status code.
  * @param   pVM                 VM handle.
  * @param   pVCpu               The VMCPU handle for the calling EMT.
  * @param   pvUser              The new g_aHaltMethods index.
  */
-static DECLCALLBACK(int) vmR3SetHaltMethodCallback(PVM pVM, PVMCPU pVCpu, void *pvUser)
+static DECLCALLBACK(VBOXSTRICTRC) vmR3SetHaltMethodCallback(PVM pVM, PVMCPU pVCpu, void *pvUser)
 {
     PUVM        pUVM = pVM->pUVM;