Changeset 3345 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 2, 2007 10:15:13 AM (17 years ago)

Author:

vboxsync

Message:

Automatically enable HGCM host events, when the guest issues HGCM commands.

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VBoxDev.cpp (modified) (2 diffs)
• VMMDevHGCM.cpp (modified) (3 diffs)
• VMMDevState.h (modified) (3 diffs)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -209 +209 @@
 }
 
-static void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
-                                          uint32_t u32OrMask,
-                                          uint32_t u32NotMask)
+void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
+                                   uint32_t u32OrMask,
+                                   uint32_t u32NotMask)
 {
     const bool fHadEvents =
@@ -1774 +1774 @@
 
 #ifdef VBOX_HGCM
+    pData->pHGCMCmdList = NULL;
     rc = RTCritSectInit(&pData->critsectHGCMCmdList);
     AssertRCReturn(rc, rc);
+    pData->u32HGCMRefs = 0;
 #endif /* VBOX_HGCM */
 

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -23 +23 @@
 
 #include <iprt/alloc.h>
+#include <iprt/asm.h>
 #include <iprt/assert.h>
 #include <iprt/param.h>
@@ -125 +126 @@
         pCmd->enmCmdType = enmCmdType;
         pCmd->GCPtr = GCPtr;
+        
+        /* Automatically enable HGCM events, if there are HGCM commands. */
+        if (   enmCmdType == VBOXHGCMCMDTYPE_CONNECT
+            || enmCmdType == VBOXHGCMCMDTYPE_DISCONNECT
+            || enmCmdType == VBOXHGCMCMDTYPE_CALL)
+        {
+            uint32_t u32 = ASMAtomicIncU32 (&pVMMDevState->u32HGCMRefs);
+            Assert(u32 != 0);
+            vmmdevCtlGuestFilterMask_EMT (pVMMDevState, VMMDEV_EVENT_HGCM, 0);
+        }
 
         vmmdevHGCMCmdListUnlock (pVMMDevState);
@@ -158 +169 @@
         {
             pVMMDevState->pHGCMCmdList = pCmd->pNext;
+        }
+
+        /* Automatically disable HGCM events, if there are no more HGCM commands. */
+        if (   pCmd->enmCmdType == VBOXHGCMCMDTYPE_CONNECT
+            || pCmd->enmCmdType == VBOXHGCMCMDTYPE_DISCONNECT
+            || pCmd->enmCmdType == VBOXHGCMCMDTYPE_CALL)
+        {
+            uint32_t u32 = ASMAtomicDecU32 (&pVMMDevState->u32HGCMRefs);
+            Assert(u32 != 0xFFFFFFFF);
+            if (u32 == 0)
+            {
+                vmmdevCtlGuestFilterMask_EMT (pVMMDevState, 0, VMMDEV_EVENT_HGCM);
+            }
         }
 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -76 +76 @@
     /** Current host side event flags */
     uint32_t u32HostEventFlags;
-    /** Mask of events guest is interested in */
+    /** Mask of events guest is interested in. Note that the HGCM events 
+     *  are enabled automatically by the VMMDev device when guest issues
+     *  HGCM commands.
+     */
     uint32_t u32GuestFilterMask;
     /** Delayed mask of guest events */
@@ -145 +148 @@
     /** Critical section to protect the list. */
     RTCRITSECT critsectHGCMCmdList;
+    /** How many HGCM commands are pending. */
+    volatile uint32_t u32HGCMRefs;
 #endif /* VBOX_HGCM */
 
@@ -150 +155 @@
 
 void VMMDevNotifyGuest (VMMDevState *pVMMDevState, uint32_t u32EventMask);
+void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
+                                   uint32_t u32OrMask,
+                                   uint32_t u32NotMask);
 
 #endif /* __VMMDevState_h__ */