Changeset 75991 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Dec 5, 2018 8:14:57 PM (6 years ago)

Author:

vboxsync

Message:

HGCM: Don't send HGCMNOTIFYEVENT_RESET on shutdown. Messes up the /VirtualBox/VMInfo/ResetCounter in saved VMs.

Location:

trunk/src/VBox/Main/src-client

Files:

• HGCM.cpp (modified) (5 diffs)
• VMMDevInterface.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -2066 +2066 @@
 class HGCMMsgMainReset: public HGCMMsgCore
 {
+    public:
+        /** Set if this is actually a shutdown and not a VM reset. */
+        bool fForShutdown;
 };
 
@@ -2307 +2310 @@
                 HGCMService::Reset();
 
-                HGCMService::BroadcastNotify(HGCMNOTIFYEVENT_RESET);
+                HGCMMsgMainReset *pMsg = (HGCMMsgMainReset *)pMsgCore;
+                if (!pMsg->fForShutdown)
+                    HGCMService::BroadcastNotify(HGCMNOTIFYEVENT_RESET);
             } break;
 
@@ -2909 +2914 @@
 #endif
 
-int HGCMHostReset(void)
+int HGCMHostReset(bool fForShutdown)
 {
     LogFlowFunc(("\n"));
@@ -2916 +2921 @@
      */
 
-    HGCMMsgCore *pMsg;
-    int rc = hgcmMsgAlloc(g_pHgcmThread, &pMsg, HGCM_MSG_RESET, hgcmMainMessageAlloc);
+    HGCMMsgCore *pMsgCore;
+    int rc = hgcmMsgAlloc(g_pHgcmThread, &pMsgCore, HGCM_MSG_RESET, hgcmMainMessageAlloc);
 
     if (RT_SUCCESS(rc))
+    {
+        HGCMMsgMainReset *pMsg = (HGCMMsgMainReset *)pMsgCore;
+
+        pMsg->fForShutdown = fForShutdown;
+
         rc = hgcmMsgSend(pMsg);
+    }
 
     LogFlowFunc(("rc = %Rrc\n", rc));
@@ -2956 +2967 @@
      */
 
-    int rc = HGCMHostReset();
+    int rc = HGCMHostReset(true /*fForShutdown*/);
 
     if (RT_SUCCESS(rc))

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -827 +827 @@
     LogFlow(("VMMDev::drvReset: iInstance=%d\n", pDrvIns->iInstance));
 #ifdef VBOX_WITH_HGCM
-    HGCMHostReset();
+    HGCMHostReset(false /*fForShutdown*/);
 #endif
 }