Changeset 42700 in vbox for trunk

Timestamp:

Aug 9, 2012 12:50:39 AM (12 years ago)

Author:

vboxsync

Message:

pgmPoolAccessHandlerFlush: Deal with VINF_EM_RESCHEDULE.

File:

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

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

@@ -837 +837 @@
      */
     VBOXSTRICTRC rc2 = EMInterpretInstructionDisasState(pVCpu, pDis, pRegFrame, pvFault, EMCODETYPE_ALL);
-    if (RT_SUCCESS(rc2))
-        AssertMsg(rc2 == VINF_SUCCESS, ("%Rrc\n", VBOXSTRICTRC_VAL(rc2))); /* ASSUMES no complicated stuff here. */
+    if (rc2 == VINF_SUCCESS)
+    { /* do nothing */ }
+#ifdef VBOX_WITH_IEM
+    else if (rc2 == VINF_EM_RESCHEDULE)
+    {
+        if (rc == VINF_SUCCESS)
+            rc = rc2;
+# ifndef IN_RING3
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
+# endif
+    }
+#endif
     else if (rc2 == VERR_EM_INTERPRETER)
     {
@@ -856 +866 @@
         }
     }
+    else if (RT_FAILURE_NP(rc2))
+        rc = VBOXSTRICTRC_VAL(rc2);
     else
-        rc = VBOXSTRICTRC_VAL(rc2);
+        AssertMsgFailed(("%Rrc\n", VBOXSTRICTRC_VAL(rc2))); /* ASSUMES no complicated stuff here. */
 
     LogFlow(("pgmPoolAccessHandlerPT: returns %Rrc (flushed)\n", rc));