Changeset 30668 in vbox

Timestamp:

Jul 6, 2010 2:26:53 PM (15 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

Files:

• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• include/VBox/VMMDev.h (modified) (3 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (7 diffs)
• src/VBox/Devices/VMMDev/VMMDev.cpp (modified) (4 diffs)
• src/VBox/Devices/VMMDev/VMMDevState.h (modified) (1 diff)

trunk/include/VBox/VBoxGuestLib.h

@@ -414 +414 @@
 VBGLR3DECL(int)     VbglR3GetAdditionsVersion(char **ppszVer, char **ppszRev);
 VBGLR3DECL(int)     VbglR3GetAdditionsInstallationPath(char **ppszPath);
+VBGLR3DECL(int)     VbglR3GetSessionId(uint64_t *pu64IdSession);
+
 /** @} */
 

trunk/include/VBox/VMMDev.h

@@ -176 +176 @@
     VMMDevReq_GetPageSharingStatus       = 215,
     VMMDevReq_DebugIsPageShared          = 216,
+    VMMDevReq_GetSessionId               = 217, /* since version 3.2.6 */
     VMMDevReq_SizeHack                   = 0x7fffffff
 } VMMDevRequestType;
@@ -1204 +1205 @@
     bool                        fAlignment[3];
 } VMMDevPageIsSharedRequest;
+
+/**
+ * Session id request structure.
+ *
+ * Used by VMMDevReq_GetSessionId.
+ */
+typedef struct
+{
+    /** Header */
+    VMMDevRequestHeader header;
+    /** OUT: unique session id; the id will be different after each start, reset or restore of the VM */
+    uint64_t            idSession;
+} VMMDevReqSessionId;
+AssertCompileSize(VMMDevReqSessionId, 24+8);
 
 #pragma pack()
@@ -1717 +1732 @@
         case VMMDevReq_DebugIsPageShared:
             return sizeof(VMMDevPageIsSharedRequest);
+        case VMMDevReq_GetSessionId:
+            return sizeof(VMMDevReqSessionId);
         default:
             return 0;

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; 
+        }
+
     }
 

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -33 +33 @@
 
 #include <iprt/asm.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/assert.h>
 #include <iprt/buildconfig.h>
@@ -1880 +1881 @@
         }
 #endif
+
+        /*
+         * Get a unique session id for this VM; the id will be different after each start, reset or restore of the VM
+         * This can be used for restore detection inside the guest.
+         */
+        case VMMDevReq_GetSessionId:
+        {
+            if (pRequestHeader->size != sizeof(VMMDevReqSessionId))
+            {
+                AssertMsgFailed(("VMMDevReq_GetSessionId request size too small.\n"));
+                pRequestHeader->rc = VERR_INVALID_PARAMETER;
+            }
+            else
+            {
+                VMMDevReqSessionId *pReq = (VMMDevReqSessionId *)pRequestHeader;
+                pReq->idSession = pThis->idSession;
+                pRequestHeader->rc = VINF_SUCCESS;
+            }
+            break;
+        }
+
         default:
         {
             pRequestHeader->rc = VERR_NOT_IMPLEMENTED;
-
             Log(("VMMDev unknown request type %d\n", pRequestHeader->requestType));
-
             break;
         }
@@ -2707 +2727 @@
     if (fCapsChanged)
         pThis->pDrv->pfnUpdateGuestCapabilities(pThis->pDrv, pThis->guestCaps);
+
+    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore. 
+     * This can be used for restore detection inside the guest.
+     */
+    pThis->idSession = ASMReadTSC();
 }
 
@@ -2930 +2955 @@
     PDMDevHlpSTAMRegisterF(pDevIns, &pThis->StatMemBalloonChunks, STAMTYPE_U32, STAMVISIBILITY_ALWAYS, STAMUNIT_COUNT, "Memory balloon size", "/Devices/VMMDev/BalloonChunks");
 
+    /* Generate a unique session id for this VM; it will be changed for each start, reset or restore. 
+     * This can be used for restore detection inside the guest.
+     */
+    pThis->idSession = ASMReadTSC();
     return rc;
 }

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -164 +164 @@
     /* guest ram size */
     uint64_t    cbGuestRAM;
+    
+    /* unique session id; the id will be different after each start, reset or restore of the VM. */
+    uint64_t    idSession;
 
     /* statistics interval change request */