Changeset 75740 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 26, 2018 3:59:11 PM (6 years ago)

Author:

vboxsync

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

126941

Message:

HGCM,VMMDev: Made the HGCM command/message completion callback return a status code so VMMDev can indicate that a guest call was cancelled and the service could implement a way of dealing with that, rather than just dropping information. Ran into this with SIGCHLD delivery interrupting GUEST_MSG_WAIT and dropping crucial HOST_SESSION_CLOSE close messages, causing the host to wait until sometime timed out and probably left stuff/processes behind.

Location:

trunk/src/VBox/Main

Files:

• include/HGCMThread.h (modified) (1 diff)
• src-client/HGCM.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/HGCMThread.h

@@ -44 +44 @@
  *                  or from HGCM.
  * @param pMsgCore  Pointer to just processed message.
- */
-typedef DECLCALLBACK(void) HGCMMSGCALLBACK(int32_t result, HGCMMsgCore *pMsgCore);
+ *
+ * @return Restricted set of VBox status codes when guest call message:
+ * @retval VINF_SUCCESS on success
+ * @retval VERR_CANCELLED if the request was cancelled.
+ * @retval VERR_ALREADY_RESET if the VM is resetting.
+ * @retval VERR_NOT_AVAILABLE if HGCM has been disconnected from the VMMDev
+ *         (shouldn't happen).
+ */
+typedef DECLCALLBACK(int) HGCMMSGCALLBACK(int32_t result, HGCMMsgCore *pMsgCore);
+/** Pointer to a message completeion callback function. */
 typedef HGCMMSGCALLBACK *PHGCMMSGCALLBACK;
 

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

@@ -895 +895 @@
 
 
-static DECLCALLBACK(void) hgcmMsgCompletionCallback(int32_t result, HGCMMsgCore *pMsgCore)
+static DECLCALLBACK(int) hgcmMsgCompletionCallback(int32_t result, HGCMMsgCore *pMsgCore)
 {
     /* Call the VMMDev port interface to issue IRQ notification. */
@@ -902 +902 @@
     LogFlow(("MAIN::hgcmMsgCompletionCallback: message %p\n", pMsgCore));
 
-    if (pMsgHdr->pHGCMPort && !g_fResetting)
-    {
-        pMsgHdr->pHGCMPort->pfnCompleted(pMsgHdr->pHGCMPort, g_fSaveState? VINF_HGCM_SAVE_STATE: result, pMsgHdr->pCmd);
-    }
+    if (pMsgHdr->pHGCMPort)
+    {
+        if (!g_fResetting)
+            return pMsgHdr->pHGCMPort->pfnCompleted(pMsgHdr->pHGCMPort,
+                                                    g_fSaveState ? VINF_HGCM_SAVE_STATE : result, pMsgHdr->pCmd);
+        return VERR_ALREADY_RESET; /* best I could find. */
+    }
+    return VERR_NOT_AVAILABLE;
 }
 
@@ -1723 +1727 @@
 #ifdef VBOX_WITH_CRHGSMI
 
-static DECLCALLBACK(void) hgcmMsgFastCallCompletionCallback(int32_t result, HGCMMsgCore *pMsgCore)
+static DECLCALLBACK(int) hgcmMsgFastCallCompletionCallback(int32_t result, HGCMMsgCore *pMsgCore)
 {
     /* Call the VMMDev port interface to issue IRQ notification. */
@@ -1731 +1735 @@
     if (pMsg->pfnCompletion)
         pMsg->pfnCompletion(result, pMsg->u32Function, &pMsg->Param, pMsg->pvCompletion);
+    return VINF_SUCCESS;
 }