Changeset 107194 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Nov 29, 2024 2:47:06 PM (3 months ago)

Author:

vboxsync

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

166196

Message:

VMM: More adjustments for VBOX_WITH_ONLY_PGM_NEM_MODE, VBOX_WITH_MINIMAL_R0, VBOX_WITH_HWVIRT and such. jiraref:VBP-1466

File:

• trunk/src/VBox/VMM/include/PGMInternal.h (modified) (7 diffs)

trunk/src/VBox/VMM/include/PGMInternal.h

@@ -3180 +3180 @@
     PDMCRITSECT                     CritSectX;
 
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     /**
      * Data associated with managing the ring-3 mappings of the allocation chunks.
@@ -3189 +3190 @@
         /** The chunk tree, ordered by chunk id. */
         R3PTRTYPE(PAVLU32NODECORE)  pTree;
-#if HC_ARCH_BITS == 32
+# if HC_ARCH_BITS == 32
         uint32_t                    u32Alignment0;
-#endif
+# endif
         /** The number of mapped chunks. */
         uint32_t                    c;
@@ -3203 +3204 @@
         uint32_t                    au32Alignment1[3];
     } ChunkR3Map;
+#endif
 
     /** The page mapping TLB for ring-3. */
@@ -3308 +3310 @@
     uint32_t                        cReadLockedPages;       /**< The number of read locked pages. */
     uint32_t                        cBalloonedPages;        /**< The number of ballooned pages. */
+#ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
     uint32_t                        cMappedChunks;          /**< Number of times we mapped a chunk. */
     uint32_t                        cUnmappedChunks;        /**< Number of times we unmapped a chunk. */
+#endif
     uint32_t                        cLargePages;            /**< The number of large pages. */
     uint32_t                        cLargePagesDisabled;    /**< The number of disabled large pages. */
@@ -3338 +3342 @@
 AssertCompileMemberAlignment(PGM, CritSectX, 32);
 AssertCompileMemberAlignment(PGM, CritSectX, 64);
-AssertCompileMemberAlignment(PGM, ChunkR3Map, 16);
 AssertCompileMemberAlignment(PGM, PhysTlbR3, 8);
 AssertCompileMemberAlignment(PGM, PhysTlbR3, 16);
@@ -3344 +3347 @@
 AssertCompileMemberAlignment(PGM, PhysTlbR0, 32);
 # ifndef VBOX_WITH_ONLY_PGM_NEM_MODE
+AssertCompileMemberAlignment(PGM, ChunkR3Map, 16);
 AssertCompileMemberAlignment(PGM, HCPhysZeroPg, 8);
 # endif
@@ -3941 +3945 @@
 int             pgmPhysPageMap(PVMCC pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, void **ppv);
 int             pgmPhysPageMapReadOnly(PVMCC pVM, PPGMPAGE pPage, RTGCPHYS GCPhys, void const **ppv);
+#if 0 /* unused */
 int             pgmPhysPageMapByPageID(PVMCC pVM, uint32_t idPage, RTHCPHYS HCPhys, void **ppv);
+#endif
 int             pgmPhysGCPhys2R3Ptr(PVMCC pVM, RTGCPHYS GCPhys, PRTR3PTR pR3Ptr);
 int             pgmPhysGCPhys2CCPtrLockless(PVMCPUCC pVCpu, RTGCPHYS GCPhys, void **ppv);