Changeset 30646 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Jul 6, 2010 8:00:31 AM (15 years ago)

Author:

vboxsync

Message:

Reregister all shared modules after VM restore

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

@@ -85 +85 @@
 
 
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *);
+static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser);
 
 static PAVLPVNODECORE   pKnownModuleTree = NULL;
@@ -487 +487 @@
 
     /* Check all registered modules. */
-    VbglR3CheckSharedModules();
-
-    /* Activate new module tree. */
-    pKnownModuleTree = pNewTree;
+    int rc = VbglR3CheckSharedModules();
+    if (rc == VINF_PGM_SHARED_MODULE_NONE_REGISTERED)
+    {
+        bool fUnregister = false;
+        /* The VM was restored, so reregister all modules the next time. */
+        RTAvlPVDestroy(&pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister);
+        pKnownModuleTree = NULL;
+    }
+    else
+    {
+        /* Activate new module tree. */
+        pKnownModuleTree = pNewTree;
+    }
 }
 
@@ -496 +505 @@
  * RTAvlPVDestroy callback.
  */
-static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *)
+static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser)
 {
     PKNOWN_MODULE pModule = (PKNOWN_MODULE)pNode;
+    bool *pfUnregister = (bool *)pvUser;
 
     VBoxServiceVerbose(3, "VBoxServicePageSharingEmptyTreeCallback %s %s\n", pModule->Info.szModule, pModule->szFileVersion);
 
-    /* Defererence module in the hypervisor. */
-    int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR64)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
-    AssertRC(rc);
+    /* Dereference module in the hypervisor. */
+    if (    !pfUnregister
+        ||  *pfUnregister == true)
+    {
+    #ifdef RT_ARCH_X86
+        int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR32)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
+    #else
+        int rc = VbglR3UnregisterSharedModule(pModule->Info.szModule, pModule->szFileVersion, (RTGCPTR64)pModule->Info.modBaseAddr, pModule->Info.modBaseSize);
+    #endif
+        AssertRC(rc);
+    }
 
     if (pModule->hModule)