Changeset 101002 in vbox for trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

Timestamp:

Sep 1, 2023 2:03:12 PM (15 months ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10318 Naming consistency nits.

File:

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

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

@@ -2797 +2797 @@
         Assert(pShwPage->enmKind == PGMPOOLKIND_EPT_PT_FOR_EPT_2MB);
 #endif
-        uint64_t const fGstPteFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask & ~EPT_E_LEAF)
-                                    | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
-        pGstWalkAll->u.Ept.Pte.u = GCPhysPage | fGstPteFlags;
+        uint64_t const fGstShwPteFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask & ~EPT_E_LEAF)
+                                       | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
+        pGstWalkAll->u.Ept.Pte.u = GCPhysPage | fGstShwPteFlags;
 
         unsigned const iPte = (GCPhysNestedPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
@@ -2990 +2990 @@
          * If we have a 2M backing page, we can map the guest's 2M page right away.
          */
-        uint64_t const fShwBigPdeFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask)
-                                       | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
+        uint64_t const fGstShwBigPdeFlags = (pGstWalkAll->u.Ept.Pde.u & pVCpu->pgm.s.fGstEptShadowedBigPdeMask)
+                                          | EPT_E_MEMTYPE_WB | EPT_E_IGNORE_PAT;
         if (HCPhys != NIL_RTHCPHYS)
         {
-            Pde.u = HCPhys | fShwBigPdeFlags;
+            Pde.u = HCPhys | fGstShwBigPdeFlags;
             Assert(!(Pde.u & pVCpu->pgm.s.fGstEptMbzBigPdeMask));
             Assert(Pde.u & EPT_E_LEAF);
@@ -3048 +3048 @@
         {
             /* The 4K PTEs shall inherit the flags of the 2M PDE page sans the leaf bit. */
-            uint64_t const fShwPteFlags = fShwBigPdeFlags & ~EPT_E_LEAF;
+            uint64_t const fGstShwPteFlags = fGstShwBigPdeFlags & ~EPT_E_LEAF;
 
             /* Sync each 4K pages in the 2M range. */
@@ -3054 +3054 @@
             {
                 RTGCPHYS const GCPhysSubPage = GCPhysPt | (iPte << GUEST_PAGE_SHIFT);
-                pGstWalkAll->u.Ept.Pte.u = GCPhysSubPage | fShwPteFlags;
+                pGstWalkAll->u.Ept.Pte.u = GCPhysSubPage | fGstShwPteFlags;
                 Assert(!(pGstWalkAll->u.Ept.Pte.u & pVCpu->pgm.s.fGstEptMbzPteMask));
                 PGM_BTH_NAME(NestedSyncPageWorker)(pVCpu, &pPt->a[iPte], GCPhysSubPage, pShwPage, iPte, pGstWalkAll);