Changeset 29086 in vbox for trunk/src/VBox/VMM

Timestamp:

May 5, 2010 2:05:17 PM (15 years ago)

Author:

vboxsync

Message:

Some shared paging updates

Location:

trunk/src/VBox/VMM

Files:

• GMM.cpp (modified) (1 diff)
• PGMSharedPage.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/GMM.cpp

@@ -391 +391 @@
  * @see GMMR0RegisterSharedModule
  */
-GMMR3DECL(int) GMMR3UnregisterSharedModule(PVM pVM, char *pszModuleName, char *pszVersion, RTGCPTR GCBaseAddr, uint32_t cbModule)
-{
-    GMMUNREGISTERSHAREDMODULEREQ Req;
-    Req.Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
-    Req.Hdr.cbReq = sizeof(Req);
-
-    Req.GCBaseAddr    = GCBaseAddr;
-    Req.cbModule      = cbModule;
-
-    if (    RTStrCopy(Req.szName, sizeof(Req.szName), pszModuleName) != VINF_SUCCESS
-        ||  RTStrCopy(Req.szVersion, sizeof(Req.szVersion), pszVersion) != VINF_SUCCESS)
-    {
-        return VERR_BUFFER_OVERFLOW;
-    }
-
-    return VMMR3CallR0(pVM, VMMR0_DO_GMM_UNREGISTER_SHARED_MODULE, 0, &Req.Hdr);
+GMMR3DECL(int) GMMR3UnregisterSharedModule(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
+{
+    pReq->Hdr.u32Magic = SUPVMMR0REQHDR_MAGIC;
+    pReq->Hdr.cbReq = sizeof(*pReq);
+    return VMMR3CallR0(pVM, VMMR0_DO_GMM_UNREGISTER_SHARED_MODULE, 0, &pReq->Hdr);
 }
 

trunk/src/VBox/VMM/PGMSharedPage.cpp

@@ -54 +54 @@
         unsigned cFlushedPages = 0;
 
-        /** todo count copy-on-write actions in the trap handler so we don't check everything all the time! */
+        /** todo count copy-on-write actions in the trap handler so we don't have to check everything all the time! */
 
         /* Count the number of shared pages that were changed (copy-on-write). */
@@ -124 +124 @@
     AssertReturn(pReq, VERR_NO_MEMORY);
 
-    pReq->Hdr.u32Magic  = SUPVMMR0REQHDR_MAGIC;
-    pReq->Hdr.cbReq     = sizeof(*pReq);
     pReq->GCBaseAddr    = GCBaseAddr;
     pReq->cbModule      = cbModule;
@@ -146 +144 @@
 }
 
+
+#ifdef VBOX_WITH_PAGE_SHARING
+/**
+ * Shared module unregistration helper (called on the way out).
+ *
+ * @param   pVM         The VM handle.
+ * @param   pReq        Unregistration request info
+ */
+static DECLCALLBACK(void) pgmR3SharedModuleUnregisterHelper(PVM pVM, PGMMREGISTERSHAREDMODULEREQ pReq)
+{
+    int rc;
+    
+    rc = GMMR3UnregisterSharedModule(pVM, pReq);
+    RTMemFree(pReq);
+    return;
+}
+#endif
 
 /**
@@ -160 +175 @@
 {
 #ifdef VBOX_WITH_PAGE_SHARING
-    return GMMR3UnregisterSharedModule(pVM, pszModuleName, pszVersion, GCBaseAddr, cbModule);
+    PGMMUNREGISTERSHAREDMODULEREQ pReq;
+
+    pReq = (PGMMUNREGISTERSHAREDMODULEREQ)RTMemAllocZ(sizeof(*pReq));
+    AssertReturn(pReq, VERR_NO_MEMORY);
+    
+    pReq->GCBaseAddr    = GCBaseAddr;
+    pReq->cbModule      = cbModule;
+
+    if (    RTStrCopy(pReq->szName, sizeof(pReq->szName), pszModuleName) != VINF_SUCCESS
+        ||  RTStrCopy(pReq->szVersion, sizeof(pReq->szVersion), pszVersion) != VINF_SUCCESS)
+    {
+        return VERR_BUFFER_OVERFLOW;
+    }
+    /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
+    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3SharedModuleUnregisterHelper, 2, pVM, pReq);
 #else 
     return VERR_NOT_IMPLEMENTED;