Changeset 1083 in vbox

Timestamp:

Feb 28, 2007 8:32:30 AM (18 years ago)

Author:

vboxsync

Message:

HGCM: VbglHGCMCall shouldn't return failure if the request produced an error; it should only do so if the request could not be completed

Location:

trunk/src/VBox/Additions/common/VBoxGuestLib

Files:

• HGCMInternal.cpp (modified) (3 diffs)
• SysHlp.cpp (modified) (1 diff)
• VBoxCalls.c (modified) (10 diffs)

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

@@ -47 +47 @@
 #include <VBox/VBoxGuestLib.h>
 #include "VBGLInternal.h"
+#include <iprt/assert.h>
 
 /* These functions can be only used by VBoxGuest. */
@@ -174 +175 @@
         /* Initialize request memory */
         pHGCMCall->header.fu32Flags = 0;
+        pHGCMCall->header.result    = VINF_SUCCESS;
 
         pHGCMCall->u32ClientID = pCallInfo->u32ClientID;
@@ -190 +192 @@
 
         dprintf (("VbglGRPerform rc = %Vrc\n", rc));
+
+        /** If the call failed, but as a result of the request itself, then pretend success  
+         *  Upper layers will interpret the result code in the packet.
+         */
+        if (VBOX_FAILURE(rc) && rc == pHGCMCall->header.result)
+        {
+            Assert(pHGCMCall->header.fu32Flags & VBOX_HGCM_REQ_DONE);
+            rc = VINF_SUCCESS;
+        }
 
         if (VBOX_SUCCESS(rc))

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

@@ -20 +20 @@
  * license agreement apply instead of the previous paragraph.
  */
+#define LOG_GROUP LOG_GROUP_HGCM
+#include <VBox/log.h>
 
 #include <VBox/VBoxGuestLib.h>
 #include "SysHlp.h"
 
-#define LOG_GROUP LOG_GROUP_HGCM
-#include <VBox/log.h>
 #include <iprt/assert.h>
 

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxCalls.c

@@ -46 +46 @@
 #endif
 
+
+#define VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data)                                           \
+    /* After a restore our client id is no longer valid; try to reconnect when that happens */  \
+    /** @todo settings lost! */ \
+    if (RT_UNLIKELY(rc == VERR_HGCM_INVALID_CLIENT_ID))                                         \
+    {                                                                                           \
+        Log(("VBOXSF: reconnect after restore\n"));                                             \
+        rc = vboxConnect(pClient);                                                              \
+        if (VBOX_SUCCESS(rc))                                                                   \
+            rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));                 \
+    }
+
 DECLVBGL(int) vboxInit (void)
 {
@@ -134 +146 @@
 */
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
+
 /*
     Log(("VBOXSF: VBoxSF::vboxCallQueryMappings: "
@@ -171 +185 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallQueryMapName: "
@@ -203 +218 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallMapFolder: "
@@ -227 +243 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallUnmapFolder: "
@@ -260 +277 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallCreate: "
@@ -318 +336 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallRemove: "
@@ -354 +373 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallRename: "
@@ -502 +522 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallDirInfo: "
@@ -538 +559 @@
 
     rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
+    VBOXSF_RECONNECT_AFTER_RESTORE(pClient, data);
 
 /*    Log(("VBOXSF: VBoxSF::vboxCallFileInfo: "