Changeset 19461 in vbox

Timestamp:

May 6, 2009 8:14:16 PM (16 years ago)

Author:

vboxsync

Message:

VMEm.cpp: Check for VMCPUSTATE_STARTED_EXEC_REM before calling REMR3NotifyFF.

File:

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

trunk/src/VBox/VMM/VMEmt.cpp

@@ -732 +732 @@
         AssertRC(rc);
     }
-    else if (   (fFlags & VMNOTIFYFF_FLAGS_POKE)
-             && pUVCpu->pVCpu
-             && pUVCpu->pVCpu->enmState == VMCPUSTATE_STARTED_EXEC)
-    {
-        int rc = SUPCallVMMR0Ex(pUVCpu->pVM->pVMR0, pUVCpu->idCpu, VMMR0_DO_GVMM_SCHED_POKE, 0, NULL);
-        AssertRC(rc);
-    }
-    else if (!(fFlags & VMNOTIFYFF_FLAGS_DONE_REM)) /** @todo use VMCPUSTATE_RUN_EXEC_REM */
-        REMR3NotifyFF(pUVCpu->pVM);
+    else if (   (   (fFlags & VMNOTIFYFF_FLAGS_POKE)
+                 || !(fFlags & VMNOTIFYFF_FLAGS_DONE_REM))
+             && pUVCpu->pVCpu)
+    {
+        VMCPUSTATE enmState = VMCPU_GET_STATE(pUVCpu->pVCpu);
+        if (enmState == VMCPUSTATE_STARTED_EXEC)
+        {
+            if (fFlags & VMNOTIFYFF_FLAGS_POKE)
+            {
+                int rc = SUPCallVMMR0Ex(pUVCpu->pVM->pVMR0, pUVCpu->idCpu, VMMR0_DO_GVMM_SCHED_POKE, 0, NULL);
+                AssertRC(rc);
+            }
+        }
+        else if (enmState == VMCPUSTATE_STARTED_EXEC_REM)
+        {
+            if (!(fFlags & VMNOTIFYFF_FLAGS_DONE_REM))
+                REMR3NotifyFF(pUVCpu->pVM);
+        }
+    }
 }
 
@@ -875 +885 @@
         AssertRC(rc);
     }
-    else if (!(fFlags & VMNOTIFYFF_FLAGS_DONE_REM))
+    else if (   !(fFlags & VMNOTIFYFF_FLAGS_DONE_REM)
+             && pUVCpu->pVCpu
+             && pUVCpu->pVCpu->enmState == VMCPUSTATE_STARTED_EXEC_REM)
         REMR3NotifyFF(pUVCpu->pVM);
 }