Changeset 95505 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jul 4, 2022 7:06:19 PM (3 years ago)

Author:

vboxsync

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

152123

Message:

Guest Control/VBoxService: Handle new VM sessions (i.e. when restoring from VM snapshot) more gracefully. bugref:10157

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (1 diff)
• VBoxServiceControlSession.cpp (modified) (1 diff)

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

@@ -342 +342 @@
         else if (rc == VERR_VM_RESTORED)
         {
-            VGSvcVerbose(1, "The VM session ID changed (i.e. restored)\n");
-            int rc2 = VGSvcGstCtrlSessionClose(&g_Session);
+            VGSvcVerbose(1, "The VM session ID changed (i.e. restored), closing stale root session\n");
+
+            /* Make sure that all other session threads are gone.
+             * This is necessary, as the new VM session (NOT to be confused with guest session!) will re-use
+             * the guest session IDs. */
+            int rc2 = VGSvcGstCtrlSessionThreadDestroyAll(&g_lstControlSessionThreads, 0 /* Flags */);
+            if (RT_FAILURE(rc2))
+                VGSvcError("Closing session threads failed with rc=%Rrc\n", rc2);
+
+            /* Make sure to also close the root session (session 0). */
+            rc2 = VGSvcGstCtrlSessionClose(&g_Session);
             AssertRC(rc2);
 

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

@@ -1860 +1860 @@
                     else if (rc == VERR_VM_RESTORED)
                     {
-                        VGSvcVerbose(1, "The VM session ID changed (i.e. restored)\n");
-                        int rc2 = VGSvcGstCtrlSessionClose(&g_Session);
-                        AssertRC(rc2);
-
-                        rc2 = VbglR3GuestCtrlSessionHasChanged(g_idControlSvcClient, g_idControlSvcClient);
-                        AssertRC(rc2);
-
-                        /* Invalidate the internal state to match the current host we got restored from. */
-                        vgsvcGstCtrlSessionInvalidate(pSession, g_idControlSvcClient);
+                        VGSvcVerbose(1, "The VM session ID changed (i.e. restored), closing stale session %RU32\n",
+                                     pSession->StartupInfo.uSessionID);
+
+                        /* We currently don't serialize guest sessions, guest processes and other guest control objects
+                         * within saved states. So just close this session and report success to the parent process.
+                         *
+                         * Note: Not notifying the host here is intentional, as it wouldn't have any information
+                         *       about what to do with it.
+                         */
+                        rc = VINF_SUCCESS; /* Report success as exit code. */
+                        break;
                     }
                     else