Changeset 18288 in vbox for trunk/src

Timestamp:

Mar 26, 2009 5:00:02 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

45039

Message:

EM.cpp: Redo emR3RawForcedActions after CSAMR3CheckCodeEx if it becomes necessary, it may register virtual access handlers which require a SyncCR3. More strictness.

File:

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

trunk/src/VBox/VMM/EM.cpp

@@ -2554 +2554 @@
         }
         /** @todo maybe prefetch the supervisor stack page as well */
+        Assert(!VM_FF_ISPENDING(pVM, VM_FF_SELM_SYNC_GDT | VM_FF_SELM_SYNC_LDT));
     }
 
@@ -2616 +2617 @@
             &&  PGMMapHasConflicts(pVM))
         {
+            PGMMapCheck(pVM);
             AssertMsgFailed(("We should not get conflicts any longer!!!\n"));
             return VERR_INTERNAL_ERROR;
@@ -2653 +2655 @@
             CSAMR3CheckCodeEx(pVM, CPUMCTX2CORE(pCtx), pCtx->eip);
             STAM_PROFILE_ADV_RESUME(&pVM->em.s.StatRAWEntry, b);
+            if (VM_FF_ISPENDING(pVM, VM_FF_HIGH_PRIORITY_PRE_RAW_MASK))
+            {
+                rc = emR3RawForcedActions(pVM, pCtx);
+                if (RT_FAILURE(rc))
+                    break;
+            }
         }
 
@@ -2729 +2737 @@
             &&  PGMMapHasConflicts(pVM))
         {
-            AssertMsgFailed(("We should not get conflicts any longer!!!\n"));
+            PGMMapCheck(pVM);
+            AssertMsgFailed(("We should not get conflicts any longer!!! rc=%Rrc\n", rc));
             return VERR_INTERNAL_ERROR;
         }