Changeset 30650 in vbox

Timestamp:

Jul 6, 2010 9:30:16 AM (15 years ago)

Author:

vboxsync

Message:

Attempt nr 2 to reinit page fusion after VM restore

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/GMMR0.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/GMMR0Internal.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -479 +479 @@
 /** Inconsistent local and global registration records. */
 #define VERR_PGM_SHARED_MODULE_REGISTRATION_INCONSISTENCY (-1650)
-/** No registered modules. */
-#define VINF_PGM_SHARED_MODULE_NONE_REGISTERED  (1651)
+/** First shared module check. */
+#define VINF_PGM_SHARED_MODULE_FIRST_CHECK      (1651)
 /** @} */
 

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

@@ -483 +483 @@
     }
 
+    bool fFirstCheck = (pKnownModuleTree == NULL);
+
     /* Delete leftover modules in the old tree. */
     RTAvlPVDestroy(&pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, NULL);
@@ -488 +490 @@
     /* Check all registered modules. */
     int rc = VbglR3CheckSharedModules();
-    if (rc == VINF_PGM_SHARED_MODULE_NONE_REGISTERED)
+    if (    rc == VINF_PGM_SHARED_MODULE_FIRST_CHECK
+        &&  !fFirstCheck)
     {
         bool fUnregister = false;

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

@@ -4169 +4169 @@
 
         Log(("GMMR0CheckSharedModules\n"));
-        if (pGVM->gmm.s.pSharedModuleTree != NULL)
-        {
-            Info.pGVM     = pGVM;
-            Info.idCpu    = pVCpu->idCpu;
-
-            RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Info);
+        Info.pGVM     = pGVM;
+        Info.idCpu    = pVCpu->idCpu;
+
+        RTAvlGCPtrDoWithAll(&pGVM->gmm.s.pSharedModuleTree, true /* fFromLeft */, gmmR0CheckSharedModule, &Info);
+
+        if (pGVM->gmm.s.fFirstCheckSharedModule)
+        {
+            /* To make sure the guest additions can detect a VM restore as that needs a reregistration of all modules. */
+            rc = VINF_PGM_SHARED_MODULE_FIRST_CHECK;
+            pGVM->gmm.s.fFirstCheckSharedModule = false;
+        }
+        else
             rc = VINF_SUCCESS;
-        }
-        else
-            rc = VINF_PGM_SHARED_MODULE_NONE_REGISTERED;
 
         Log(("GMMR0CheckSharedModules done!\n"));

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

@@ -107 +107 @@
     bool                fSharedPagingEnabled;
 
+    /** First GMMR0CheckSharedModules call? */
+    bool                fFirstCheckSharedModule;
+
     /** Whether the VM is allowed to allocate memory or not.
      * This is used when the reservation update request fails or when the VM has