Changeset 29308 in vbox

Timestamp:

May 10, 2010 3:23:09 PM (15 years ago)

Author:

vboxsync

Message:

Shared paging updates

Location:

trunk

Files:

• include/VBox/gmm.h (modified) (1 diff)
• src/VBox/VMM/PGMSharedPage.cpp (modified) (3 diffs)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/GMMR0Internal.h (modified) (1 diff)

trunk/include/VBox/gmm.h

@@ -294 +294 @@
 GMMR0DECL(int)  GMMR0MapUnmapChunk(PVM pVM, VMCPUID idCpu, uint32_t idChunkMap, uint32_t idChunkUnmap, PRTR3PTR ppvR3);
 GMMR0DECL(int)  GMMR0SeedChunk(PVM pVM, VMCPUID idCpu, RTR3PTR pvR3);
-GMMR0DECL(int)  GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, 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, unsigned cRegions, 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);

trunk/src/VBox/VMM/PGMSharedPage.cpp

@@ -125 +125 @@
  * @returns VBox status code.
  * @param   pVM                 VM handle
+ * @param   enmGuestOS          Guest OS type
  * @param   pszModuleName       Module name
  * @param   pszVersion          Module version
@@ -132 +133 @@
  * @param   pRegions            Shared region(s)
  */
-VMMR3DECL(int) PGMR3SharedModuleRegister(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule,
+VMMR3DECL(int) PGMR3SharedModuleRegister(PVM pVM, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule,
                                          unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions)
 {
@@ -144 +145 @@
     AssertReturn(pReq, VERR_NO_MEMORY);
 
+    pReq->enmGuestOS    = enmGuestOS;
     pReq->GCBaseAddr    = GCBaseAddr;
     pReq->cbModule      = cbModule;

trunk/src/VBox/VMM/VMMR0/GMMR0.cpp

@@ -3451 +3451 @@
  * @param   pVM                 VM handle
  * @param   idCpu               VCPU id
+ * @param   enmGuestOS          Guest OS type
  * @param   pszModuleName       Module name
  * @param   pszVersion          Module version
@@ -3458 +3459 @@
  * @param   pRegions            Shared region(s)
  */
-GMMR0DECL(int) GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule,
+GMMR0DECL(int) GMMR0RegisterSharedModule(PVM pVM, VMCPUID idCpu, VBOXOSFAMILY enmGuestOS, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule,
                                          unsigned cRegions, VMMDEVSHAREDREGIONDESC *pRegions)
 {
@@ -3524 +3525 @@
             strcpy(pGlobalModule->szVersion, pszVersion);
 
-            pGlobalModule->cRegions = cRegions;
+            pGlobalModule->enmGuestOS = enmGuestOS;
+            pGlobalModule->cRegions   = cRegions;
 
             for (unsigned i = 0; i < cRegions; i++)
@@ -3597 +3599 @@
     AssertMsgReturn(pReq->Hdr.cbReq >= sizeof(*pReq) && pReq->Hdr.cbReq == RT_UOFFSETOF(GMMREGISTERSHAREDMODULEREQ, aRegions[pReq->cRegions]), ("%#x != %#x\n", pReq->Hdr.cbReq, sizeof(*pReq)), VERR_INVALID_PARAMETER);
 
-    return GMMR0RegisterSharedModule(pVM, idCpu, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions);
+    return GMMR0RegisterSharedModule(pVM, idCpu, pReq->enmGuestOS, pReq->szName, pReq->szVersion, pReq->GCBaseAddr, pReq->cbModule, pReq->cRegions, pReq->aRegions);
 }
 

trunk/src/VBox/VMM/VMMR0/GMMR0Internal.h

@@ -69 +69 @@
     /** Number of users (VMs). */
     uint32_t                    cUsers;
-    /** Align. */
-    uint32_t                    u32Align;
+    /** Guest OS family type. */
+    VBOXOSFAMILY                enmGuestOS;
     /** Module name */
     char                        szName[GMM_SHARED_MODULE_MAX_NAME_STRING];