Changeset 40005 in vbox for trunk/include/VBox

Timestamp:

Feb 6, 2012 10:47:20 AM (13 years ago)

Author:

vboxsync

Message:

More GMM stats. Added todo regarding GMMR0SharedModuleCheckPage assertion.

Location:

trunk/include/VBox/vmm

Files:

• gmm.h (modified) (5 diffs)
• pgm.h (modified) (1 diff)

trunk/include/VBox/vmm/gmm.h

@@ -29 +29 @@
 #include <VBox/vmm/gvmm.h>
 #include <VBox/sup.h>
-#include <VBox/VMMDev.h> /* for VMMDEVSHAREDREGIONDESC */
 #include <VBox/param.h>
 #include <iprt/avl.h>
@@ -326 +325 @@
     /** The number of pages we've currently requested the guest to take back. */
     uint64_t            cReqDeflatePages;
+    /** The number of shareable module tracked by this VM. */
+    uint32_t            cShareableModules;
 
     /** The current over-commitment policy. */
@@ -340 +341 @@
      * been told to suspend/save/die in an out-of-memory case. */
     bool                fMayAllocate;
-
     /** Explicit alignment. */
-    bool                afReserved[5];
+    bool                afReserved[1];
+
+
 } GMMVMSTATS;
 
@@ -406 +408 @@
 GMMR0DECL(int)  GMMR0MapUnmapChunk(PVM pVM, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
 GMMR0DECL(int)  GMMR0SeedChunk(PVM pVM, VMCPUID idCpu, RTR3PTR pvR3);
-GMMR0DECL(int)  GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule, unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions);
+GMMR0DECL(int)  GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion,
+                                          RTGCPTR GCBaseAddr,  uint32_t cbModule, uint32_t cRegions,
+                                          struct VMMDEVSHAREDREGIONDESC *pRegions);
 GMMR0DECL(int)  GMMR0UnregisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule);
 GMMR0DECL(int)  GMMR0UnregisterAllSharedModules(PVM pVM, VMCPUID idCpu);
@@ -634 +638 @@
 typedef struct GMMSHAREDMODULE
 {
-    /* Tree node. */
+    /** Tree node. */
     AVLGCPTRNODECORE            Core;
     /** Shared module size. */

trunk/include/VBox/vmm/pgm.h

@@ -427 +427 @@
 VMMR0DECL(int)      PGMR0PhysAllocateLargeHandyPage(PVM pVM, PVMCPU pVCpu);
 VMMR0_INT_DECL(int) PGMR0PhysSetupIommu(PVM pVM);
-VMMR0DECL(int)      PGMR0SharedModuleCheck(PVM pVM, PGVM pGVM, VMCPUID idCpu, PGMMSHAREDMODULE pModule, uint32_t cRegions, PGMMSHAREDREGIONDESC pRegions);
+VMMR0DECL(int)      PGMR0SharedModuleCheck(PVM pVM, PGVM pGVM, VMCPUID idCpu, PGMMSHAREDMODULE pModule, uint32_t cRegions, PGMMSHAREDREGIONDESC paRegions);
 VMMR0DECL(int)      PGMR0Trap0eHandlerNestedPaging(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
 VMMR0DECL(VBOXSTRICTRC) PGMR0Trap0eHandlerNPMisconfig(PVM pVM, PVMCPU pVCpu, PGMMODE enmShwPagingMode, PCPUMCTXCORE pRegFrame, RTGCPHYS GCPhysFault, uint32_t uErr);