Changeset 8700 in vbox

Timestamp:

May 8, 2008 11:47:27 AM (17 years ago)

Author:

vboxsync

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

30638

Message:

Linux additions: Only VbglHGCMCall() can deal with cancelled requests

Location:

trunk

Files:

• include/VBox/VBoxGuestLib.h (modified) (3 diffs)
• src/VBox/Additions/linux/module/cmc.c (modified) (2 diffs)

trunk/include/VBox/VBoxGuestLib.h

@@ -150 +150 @@
  * obtain a client identifier for future access.
  *
+ * @note This function can NOT handle cancelled requests!
+ *
  * @param pConnectInfo    The request data.
  * @param pAsyncCallback  Required pointer to function that is called when
@@ -168 +170 @@
  * the client will not call the service anymore.
  *
+ * @note This function can NOT handle cancelled requests!
+ *
  * @param pDisconnectInfo The request data.
  * @param pAsyncCallback  Required pointer to function that is called when
@@ -181 +185 @@
                                   VBGLHGCMCALLBACK *pAsyncCallback, void *pvAsyncData, uint32_t u32AsyncData);
 
-/* Call a HGCM service.
+/** Call a HGCM service.
+ *
+ * @note This function can deal with cancelled requests.
  *
  * @param pCallInfo       The request data.

trunk/src/VBox/Additions/linux/module/cmc.c

@@ -30 +30 @@
 {
     VBoxDevice *dev = pvData;
+    wait_event (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
+}
+
+static DECLVBGL(void)
+vboxadd_hgcm_callback_interruptible (VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data)
+{
+    VBoxDevice *dev = pvData;
     wait_event_interruptible (dev->eventq, pHeader->fu32Flags & VBOX_HGCM_REQ_DONE);
 }
@@ -37 +44 @@
     switch (func)
     {
+        /* this function can NOT handle cancelled requests */
         case IOCTL_VBOXGUEST_HGCM_CONNECT:
             return VbglHGCMConnect (data, vboxadd_hgcm_callback, opaque, 0);
 
+        /* this function can NOT handle cancelled requests */
         case IOCTL_VBOXGUEST_HGCM_DISCONNECT:
             return VbglHGCMDisconnect (data, vboxadd_hgcm_callback, opaque, 0);
 
+        /* this function can handle cancelled requests */
         case IOCTL_VBOXGUEST_HGCM_CALL:
-            return VbglHGCMCall (data, vboxadd_hgcm_callback, opaque, 0);
+            return VbglHGCMCall (data, vboxadd_hgcm_callback_interruptible, opaque, 0);
 
         default: