Changeset 10034 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 30, 2008 5:10:48 PM (16 years ago)

Author:

vboxsync

Message:

Moved some assertions around

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllGst.h (modified) (6 diffs)

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

@@ -408 +408 @@
 PGM_GST_DECL(int, MapCR3)(PVM pVM, RTGCPHYS GCPhysCR3)
 {
-    Assert(!HWACCMIsNestedPagingActive(pVM));
 #if PGM_GST_TYPE == PGM_TYPE_32BIT \
  || PGM_GST_TYPE == PGM_TYPE_PAE \
@@ -470 +469 @@
             PPGMPOOL pPool = pVM->pgm.s.CTXSUFF(pPool);
 
+            Assert(!HWACCMIsNestedPagingActive(pVM));
+
             pVM->pgm.s.pGstPaePML4HC = (R3R0PTRTYPE(PX86PML4))HCPtrGuestCR3;
 
@@ -512 +513 @@
 {
     LogFlow(("UnmapCR3\n"));
-    Assert(!HWACCMIsNestedPagingActive(pVM));
 
     int rc = VINF_SUCCESS;
@@ -530 +530 @@
 
 #elif PGM_GST_TYPE == PGM_TYPE_AMD64
+    Assert(!HWACCMIsNestedPagingActive(pVM));
     pVM->pgm.s.pGstPaePML4HC = 0;
     pVM->pgm.s.pHCPaePML4    = 0;
@@ -563 +564 @@
 {
     Assert(!pVM->pgm.s.fMappingsFixed);
-    Assert(!HWACCMIsNestedPagingActive(pVM));
     int rc = VINF_SUCCESS;
 
@@ -666 +666 @@
 {
     int rc = VINF_SUCCESS;
-
-    Assert(!HWACCMIsNestedPagingActive(pVM));
 
     /*