Changeset 62272 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 15, 2016 10:08:14 AM (8 years ago)

Author:

vboxsync

Message:

PATMRawLeave: VINF_EM_RAW_GUEST_TRAP is probably fine too

File:

• trunk/src/VBox/VMM/VMMAll/PATMAll.cpp (modified) (1 diff)

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

@@ -168 +168 @@
 
 #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),
+    AssertReleaseMsg((efl & X86_EFL_IF) || fPatchCode   || rawRC == VINF_PATM_PENDING_IRQ_AFTER_IRET
+                     || rawRC == VINF_EM_RESCHEDULE     || rawRC == VINF_EM_RESCHEDULE_REM
+                     || rawRC == VINF_EM_RAW_GUEST_TRAP || 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));