Changeset 20198 in vbox

Timestamp:

Jun 2, 2009 2:45:01 PM (16 years ago)

Author:

vboxsync

Message:

Moved pending forced actions clearing.

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EM.cpp

@@ -3833 +3833 @@
                     else
                     {
-                        /* All other VCPUs go into the wait for SIPI state.
-                         * Make sure we clear all pending forced actions.
-                         */
-                        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
+                        /* All other VCPUs go into the wait for SIPI state. */
                         pVCpu->em.s.enmState = EMSTATE_WAIT_SIPI;
                     }

trunk/src/VBox/VMM/VM.cpp

@@ -2204 +2204 @@
      */
     VMCPU_ASSERT_STATE(pVCpu, VMCPUSTATE_STARTED);
+
+    /* Clear all pending forced actions. */
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_ALL_MASK & ~VMCPU_FF_REQUEST);
+
     if (pVCpu->idCpu != 0)
         return VINF_EM_RESET;