Changeset 30668 in vbox for trunk/src/VBox/Additions

Timestamp:

Jul 6, 2010 2:26:53 PM (14 years ago)

Author:

vboxsync

Message:

Generate a session id for the VM that is changed every time the VM starts, resets or is restored.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (1 diff)
• VBoxService/VBoxServicePageSharing.cpp (modified) (7 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp

@@ -75 +75 @@
 }
 
+/**
+ * Query the session id of this VM; this is a unique id that gets changed for each VM start, reset or restore.
+ * Useful for detection a VM restore.
+ *
+ * @returns IPRT status code.
+ * pu64IdSession    Session id (out)
+ *
+ */
+VBGLR3DECL(int) VbglR3GetSessionId(uint64_t *pu64IdSession)
+{
+    VMMDevReqSessionId Req;
+
+    vmmdevInitRequest(&Req.header, VMMDevReq_GetSessionId);
+    int rc = vbglR3GRPerform(&Req.header);
+    if (rc == VINF_SUCCESS)
+        *pu64IdSession = Req.idSession;
+
+    return rc;
+}

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

@@ -87 +87 @@
 static DECLCALLBACK(int) VBoxServicePageSharingEmptyTreeCallback(PAVLPVNODECORE pNode, void *pvUser);
 
-static PAVLPVNODECORE   pKnownModuleTree = NULL;
+static PAVLPVNODECORE   g_pKnownModuleTree = NULL;
+static uint64_t         g_idSession = 0;
 
 /**
@@ -302 +303 @@
         if (!pRec)
         {
-            pRec = RTAvlPVRemove(&pKnownModuleTree, ModuleInfo.modBaseAddr);
+            pRec = RTAvlPVRemove(&g_pKnownModuleTree, ModuleInfo.modBaseAddr);
             if (!pRec)
             {
@@ -411 +412 @@
             if (!pRec)
             {
-                pRec = RTAvlPVRemove(&pKnownModuleTree, pSystemModules->Modules[i].ImageBase);
+                pRec = RTAvlPVRemove(&g_pKnownModuleTree, pSystemModules->Modules[i].ImageBase);
                 if (!pRec)
                 {
@@ -484 +485 @@
 
     /* Delete leftover modules in the old tree. */
-    RTAvlPVDestroy(&pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, NULL);
+    RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, NULL);
 
     /* Check all registered modules. */
     VbglR3CheckSharedModules();
+
     /* Activate new module tree. */
-    pKnownModuleTree = pNewTree;
+    g_pKnownModuleTree = pNewTree;
 }
 
@@ -566 +568 @@
 #endif
 
+    rc =  VbglR3GetSessionId(&g_idSession);
+    AssertRCReturn(rc, rc);
+
     /* Never fail here. */
     return VINF_SUCCESS;
@@ -584 +589 @@
     for (;;)
     {
+        uint64_t idNewSession;
+
         VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: enabled=%d\n", VbglR3PageSharingIsEnabled());
 
@@ -605 +612 @@
             break;
         }
+        idNewSession = g_idSession;
+        rc =  VbglR3GetSessionId(&idNewSession);
+        AssertRC(rc);
+
+        if (idNewSession != g_idSession)
+        {
+            bool fUnregister = false; 
+
+            VBoxServiceVerbose(3, "VBoxServicePageSharingWorker: VM was restored!!\n"));
+            /* The VM was restored, so reregister all modules the next time. */ 
+            RTAvlPVDestroy(&g_pKnownModuleTree, VBoxServicePageSharingEmptyTreeCallback, &fUnregister); 
+            g_pKnownModuleTree = NULL; 
+        }
+
     }