Changeset 96739 in vbox

Timestamp:

Sep 14, 2022 12:21:46 PM (2 years ago)

Author:

vboxsync

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

153626

Message:

VMM/PGM: Nested VMX: bugref:10092 Naming nit.

File:

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

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

@@ -142 +142 @@
         if ((a_pVCpu)->pgm.s.enmGuestSlatMode == PGMSLAT_EPT) \
         { \
-            PGMPTWALK    SlatWalk; \
-            PGMPTWALKGST SlatGstWalk; \
-            int const rcX = pgmGstSlatWalk(a_pVCpu, a_GCPhysNested, true /* fIsLinearAddrValid */, a_GCPtrNested, &SlatWalk, \
-                                           &SlatGstWalk); \
+            PGMPTWALK    WalkSlat; \
+            PGMPTWALKGST WalkGstSlat; \
+            int const rcX = pgmGstSlatWalk(a_pVCpu, a_GCPhysNested, true /* fIsLinearAddrValid */, a_GCPtrNested, &WalkSlat, \
+                                           &WalkGstSlat); \
             if (RT_SUCCESS(rcX)) \
-                (a_GCPhysOut) = SlatWalk.GCPhys; \
+                (a_GCPhysOut) = WalkSlat.GCPhys; \
             else \
             { \
-                *(a_pWalk) = SlatWalk; \
+                *(a_pWalk) = WalkSlat; \
                 return rcX; \
             } \
@@ -379 +379 @@
     if (pVCpu->pgm.s.enmGuestSlatMode == PGMSLAT_EPT)
     {
-        PGMPTWALK    SlatWalk;
-        PGMPTWALKGST SlatGstWalk;
-        int const rc = pgmGstSlatWalk(pVCpu, GCPtr, true /* fIsLinearAddrValid */, GCPtr, &SlatWalk, &SlatGstWalk);
+        PGMPTWALK    WalkSlat;
+        PGMPTWALKGST WalkGstSlat;
+        int const rc = pgmGstSlatWalk(pVCpu, GCPtr, true /* fIsLinearAddrValid */, GCPtr, &WalkSlat, &WalkGstSlat);
         if (RT_SUCCESS(rc))
         {
             pWalk->fSucceeded = true;
             pWalk->GCPtr      = GCPtr;
-            pWalk->GCPhys     = SlatWalk.GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
+            pWalk->GCPhys     = WalkSlat.GCPhys & ~(RTGCPHYS)GUEST_PAGE_OFFSET_MASK;
             pWalk->fEffective = X86_PTE_P | X86_PTE_RW | X86_PTE_US;
         }
         else
-            *pWalk = SlatWalk;
+            *pWalk = WalkSlat;
         return rc;
     }