Changeset 14150 in vbox for trunk/src/VBox

Timestamp:

Nov 12, 2008 11:24:49 PM (16 years ago)

Author:

vboxsync

Message:

PGM: HCPhysNestedRoot -> HCPhysShwNestedRoot

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• PGMInternal.h (modified) (1 diff)
• PGMShw.h (modified) (2 diffs)
• VMMAll/PGMAll.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -1458 +1458 @@
     pVM->pgm.s.aHCPhysPaePDs[3] = MMPage2Phys(pVM, pVM->pgm.s.apShwPaePDsR3[3]);
     pVM->pgm.s.HCPhysShwPaePdpt = MMPage2Phys(pVM, pVM->pgm.s.pShwPaePdptR3);
-    pVM->pgm.s.HCPhysNestedRoot = MMPage2Phys(pVM, pVM->pgm.s.pShwNestedRootR3);
+    pVM->pgm.s.HCPhysShwNestedRoot = MMPage2Phys(pVM, pVM->pgm.s.pShwNestedRootR3);
 
     /*

trunk/src/VBox/VMM/PGMInternal.h

@@ -2111 +2111 @@
 #endif
     /** The Physical Address (HC) of the nested paging root. */
-    RTHCPHYS                        HCPhysNestedRoot;
+    RTHCPHYS                        HCPhysShwNestedRoot;
     /** @}  */
 

trunk/src/VBox/VMM/PGMShw.h

@@ -141 +141 @@
     Assert(HWACCMIsNestedPagingActive(pVM));
 
-    Log(("Enter nested shadow paging mode: root %RHv phys %RHp\n", pVM->pgm.s.pShwNestedRootR3, pVM->pgm.s.HCPhysNestedRoot));
+    Log(("Enter nested shadow paging mode: root %RHv phys %RHp\n", pVM->pgm.s.pShwNestedRootR3, pVM->pgm.s.HCPhysShwNestedRoot));
     /* In non-nested mode we allocate the PML4 page on-demand; in nested mode we just use our fixed nested paging root. */
     pVM->pgm.s.pShwPaePml4R3 = (R3PTRTYPE(PX86PML4))pVM->pgm.s.pShwNestedRootR3;
@@ -147 +147 @@
     pVM->pgm.s.pShwPaePml4R0 = (R0PTRTYPE(PX86PML4))pVM->pgm.s.pShwNestedRootR0;
 # endif
-    pVM->pgm.s.HCPhysPaePML4 = pVM->pgm.s.HCPhysNestedRoot;
+    pVM->pgm.s.HCPhysPaePML4 = pVM->pgm.s.HCPhysShwNestedRoot;
 #endif
     return VINF_SUCCESS;

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

@@ -1066 +1066 @@
 
 # ifdef VBOX_WITH_2X_4GB_ADDR_SPACE_IN_R0
-    rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysNestedRoot, &pPml4);
+    rc = PGM_HCPHYS_2_PTR(pVM, pPGM->HCPhysShwNestedRoot, &pPml4);
     AssertRCReturn(rc, rc);
 # else
@@ -1268 +1268 @@
 
         case PGMMODE_EPT:
-            return pVM->pgm.s.HCPhysNestedRoot;
+            return pVM->pgm.s.HCPhysShwNestedRoot;
 
         case PGMMODE_NESTED:
@@ -1314 +1314 @@
 VMMDECL(RTHCPHYS) PGMGetEPTCR3(PVM pVM)
 {
-    return pVM->pgm.s.HCPhysNestedRoot;
+    return pVM->pgm.s.HCPhysShwNestedRoot;
 }