Changeset 65794 in vbox for trunk/src/VBox

Timestamp:

Feb 15, 2017 8:39:16 PM (8 years ago)

Author:

vboxsync

Message:

EM: VMCPU_FF_UNHALT should be cleared together with EMMWAIT_FLAG_ACTIVE when we _really_ leave EMSTATE_HALTED.

File:

• trunk/src/VBox/VMM/VMMR3/EM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -478 +478 @@
 VMMR3_INT_DECL(void) EMR3ResetCpu(PVMCPU pVCpu)
 {
+    /* Reset scheduling state. */
     pVCpu->em.s.fForceRAW = false;
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UNHALT);
 
     /* VMR3ResetFF may return VINF_EM_RESET or VINF_EM_SUSPEND, so transition
@@ -1343 +1345 @@
          */
         if (   VM_FF_IS_PENDING(pVM, VM_FF_ALL_REM_MASK)
-            || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_ALL_REM_MASK))
+            || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_ALL_REM_MASK & ~VMCPU_FF_UNHALT))
             return VINF_SUCCESS;
     }
@@ -1898 +1900 @@
         }
 
-        /*
-         * Forced unhalting of EMT.
-         */
-        if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UNHALT))
-        {
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UNHALT);
-            if (rc == VINF_EM_HALT)
-                rc = VINF_EM_RESCHEDULE;
-            else
-            {
-                rc2 = VINF_EM_RESCHEDULE;
-                UPDATE_RC();
-            }
-        }
-
         /* check that we got them all  */
-        Assert(!(VMCPU_FF_NORMAL_PRIORITY_MASK & ~(VMCPU_FF_REQUEST | VMCPU_FF_UNHALT)));
+        Assert(!(VMCPU_FF_NORMAL_PRIORITY_MASK & ~VMCPU_FF_REQUEST));
     }
 
@@ -2211 +2198 @@
                 && rc != VINF_EM_OFF
                 && (   VM_FF_IS_PENDING(pVM, VM_FF_ALL_REM_MASK)
-                    || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_ALL_REM_MASK)))
+                    || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_ALL_REM_MASK & ~VMCPU_FF_UNHALT)))
             {
                 rc = emR3ForcedActions(pVM, pVCpu, rc);
@@ -2486 +2473 @@
                 VBOXVMM_EM_STATE_CHANGED(pVCpu, enmOldState, enmNewState, rc);
 
-                /* Clear MWait flags. */
+                /* Clear MWait flags and the unhalt FF. */
                 if (   enmOldState == EMSTATE_HALTED
-                    && (pVCpu->em.s.MWait.fWait & EMMWAIT_FLAG_ACTIVE)
+                    && (   (pVCpu->em.s.MWait.fWait & EMMWAIT_FLAG_ACTIVE)
+                        || VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UNHALT))
                     && (   enmNewState == EMSTATE_RAW
                         || enmNewState == EMSTATE_HM
@@ -2498 +2486 @@
                         || enmNewState == EMSTATE_DEBUG_GUEST_REM) )
                 {
-                    LogFlow(("EMR3ExecuteVM: Clearing MWAIT\n"));
-                    pVCpu->em.s.MWait.fWait &= ~(EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0);
+                    if (pVCpu->em.s.MWait.fWait & EMMWAIT_FLAG_ACTIVE)
+                    {
+                        LogFlow(("EMR3ExecuteVM: Clearing MWAIT\n"));
+                        pVCpu->em.s.MWait.fWait &= ~(EMMWAIT_FLAG_ACTIVE | EMMWAIT_FLAG_BREAKIRQIF0);
+                    }
+                    if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_UNHALT))
+                    {
+                        LogFlow(("EMR3ExecuteVM: Clearing UNHALT\n"));
+                        VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_UNHALT);
+                    }
                 }
             }