Changeset 68555 in vbox for trunk

Timestamp:

Aug 31, 2017 12:09:56 PM (7 years ago)

Author:

vboxsync

Message:

merging vbglioc r117701: VBoxGueSTR0LibSharedFolders,VBoxGuest.h: Added new HGCM macros for dealing with passing page lists (the lists are placed after the parameters).

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (modified) (4 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -490 +490 @@
 
 /**
+ * Initialize a HGCM header (VBGLIOCHGCMCALL) for a non-timed call, custom size.
+ *
+ * This is usually only needed when appending page lists to the call.
+ *
+ * @param   a_pHdr          The header to initalize.
+ * @param   a_idClient      The client connection ID to call thru.
+ * @param   a_idFunction    The function we're calling
+ * @param   a_cParameters   Number of parameters.
+ * @param   a_cbReq         The request size.
+ */
+# define VBGL_HGCM_HDR_INIT_EX(a_pHdr, a_idClient, a_idFunction, a_cParameters, a_cbReq) \
+    do { \
+        Assert((a_cbReq) >= sizeof(VBGLIOCHGCMCALL) + (a_cParameters) * sizeof(HGCMFunctionParameter)); \
+        VBGLREQHDR_INIT_EX(&(a_pHdr)->Hdr, (a_cbReq), (a_cbReq)); \
+        (a_pHdr)->u32ClientID    = (a_idClient); \
+        (a_pHdr)->u32Function    = (a_idFunction); \
+        (a_pHdr)->cMsTimeout     = RT_INDEFINITE_WAIT; \
+        (a_pHdr)->fInterruptible = true; \
+        (a_pHdr)->bReserved      = 0; \
+        (a_pHdr)->cParms         = (a_cParameters); \
+    } while (0)
+
+/**
  * Initialize a HGCM header (VBGLIOCHGCMCALL), with timeout (interruptible).
  *

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

@@ -52 +52 @@
     (a)->fInterruptible = false /* Currently we do like nfs with -o hard (default). */
 
+#define VBOX_INIT_CALL_EX(a, b, c, a_cbReq) \
+    LogFunc(("%s, idClient=%d\n", "SHFL_FN_" # b, (c)->idClient)); \
+    VBGL_HGCM_HDR_INIT_EX(a, (c)->idClient, SHFL_FN_##b, SHFL_CPARMS_##b, a_cbReq); \
+    (a)->fInterruptible = false /* Currently we do like nfs with -o hard (default). */
+
 
 
@@ -347 +352 @@
         return VERR_NO_TMP_MEMORY;
 
-    VBOX_INIT_CALL(&pData->callInfo, READ, pClient);
+    VBOX_INIT_CALL_EX(&pData->callInfo, READ, pClient, cbData);
 
     pData->root.type                      = VMMDevHGCMParmType_32bit;
@@ -425 +430 @@
         return VERR_NO_TMP_MEMORY;
 
-    VBOX_INIT_CALL(&pData->callInfo, WRITE, pClient);
+    VBOX_INIT_CALL_EX(&pData->callInfo, WRITE, pClient, cbData);
 
     pData->root.type                      = VMMDevHGCMParmType_32bit;
@@ -473 +478 @@
         return VERR_NO_TMP_MEMORY;
 
-    VBOX_INIT_CALL(&pData->callInfo, WRITE, pClient);
+    VBOX_INIT_CALL_EX(&pData->callInfo, WRITE, pClient, cbData);
 
     pData->root.type                      = VMMDevHGCMParmType_32bit;