Changeset 60879 in vbox for trunk

Timestamp:

May 8, 2016 11:03:39 AM (9 years ago)

Author:

vboxsync

Message:

PATMRawLeave: It's okay to end up in ring-3 with a reschduling status code and interrupts disabled, it probably means that IEM as dispatched an exception.

File:

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

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

@@ -167 +167 @@
     CTXSUFF(pVM->patm.s.pGCState)->uVMFlags = X86_EFL_IF;
 
-    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET || RT_FAILURE(rawRC), ("Inconsistent state at %RRv rc=%Rrc\n", pCtx->eip, rawRC));
+#ifdef IN_RING3
+    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET
+                     || rawRC == VINF_EM_RESCHEDULE || rawRC == VINF_EM_RESCHEDULE_REM || RT_FAILURE(rawRC),
+                     ("Inconsistent state at %RRv rc=%Rrc\n", pCtx->eip, rawRC));
     AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode || RT_FAILURE(rawRC), ("fPIF=%d eip=%RRv rc=%Rrc\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtx->eip, rawRC));
-
-#ifdef IN_RING3
     if (   (efl & X86_EFL_IF)
         && fPatchCode)
@@ -222 +223 @@
      */
     AssertMsg(!fPatchCode, ("eip=%RRv\n", pCtx->eip));
+    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET || RT_FAILURE(rawRC), ("Inconsistent state at %RRv rc=%Rrc\n", pCtx->eip, rawRC));
+    AssertReleaseMsg(CTXSUFF(pVM->patm.s.pGCState)->fPIF || fPatchCode || RT_FAILURE(rawRC), ("fPIF=%d eip=%RRv rc=%Rrc\n", CTXSUFF(pVM->patm.s.pGCState)->fPIF, pCtx->eip, rawRC));
 #endif /* !IN_RING3 */