Changeset 10317 in vbox

Timestamp:

Jul 7, 2008 1:12:49 PM (17 years ago)

Author:

vboxsync

Message:

SyncCR3 change for nested paging to deal with pool flushes.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -2997 +2997 @@
 PGM_BTH_DECL(int, SyncCR3)(PVM pVM, uint64_t cr0, uint64_t cr3, uint64_t cr4, bool fGlobal)
 {
-#if PGM_SHW_TYPE == PGM_TYPE_NESTED
-    /** @todo check if this is really necessary */
-    HWACCMFlushTLB(pVM);
-    return VINF_SUCCESS;
-
-#else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
     if (VM_FF_ISSET(pVM, VM_FF_PGM_SYNC_CR3))
         fGlobal = true; /* Change this CR3 reload to be a global one. */
@@ -3019 +3013 @@
     STAM_PROFILE_STOP(&pVM->pgm.s.CTXMID(Stat,SyncCR3Handlers), h);
 
-# ifdef PGMPOOL_WITH_MONITORING
+#ifdef PGMPOOL_WITH_MONITORING
     /*
      * When monitoring shadowed pages, we reset the modification counters on CR3 sync.
@@ -3030 +3024 @@
     else
     {
-#  ifdef IN_RING3
+# ifdef IN_RING3
         pVM->pgm.s.fSyncFlags &= ~PGM_SYNC_CLEAR_PGM_POOL;
         pgmPoolClearAll(pVM);
-#  else
+# else
         LogFlow(("SyncCR3: PGM_SYNC_CLEAR_PGM_POOL is set -> VINF_PGM_SYNC_CR3\n"));
         return VINF_PGM_SYNC_CR3;
-#  endif
-    }
-# endif
+# endif
+    }
+#endif
+
+#if PGM_SHW_TYPE == PGM_TYPE_NESTED
+    /** @todo check if this is really necessary */
+    HWACCMFlushTLB(pVM);
+    return VINF_SUCCESS;
+
+#else /* PGM_SHW_TYPE != PGM_TYPE_NESTED */
 
     Assert(fGlobal || (cr4 & X86_CR4_PGE));