Changeset 30650 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

63388

Message:

Attempt nr 2 to reinit page fusion after VM restore

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• GMMR0.cpp (modified) (1 diff)
• GMMR0Internal.h (modified) (1 diff)

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