Changeset 3379 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Jul 3, 2007 9:25:38 AM (18 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Devices/VMMDev

Files:

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

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

@@ -32 +32 @@
 #include <VBox/pgm.h>
 #include <VBox/err.h>
+#include <VBox/vm.h> /* for VM_IS_EMT */
 
 #define LOG_GROUP LOG_GROUP_DEV_VMM
@@ -209 +210 @@
 }
 
-void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
-                                   uint32_t u32OrMask,
-                                   uint32_t u32NotMask)
+static void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
+                                          uint32_t u32OrMask,
+                                          uint32_t u32NotMask)
 {
     const bool fHadEvents =
@@ -230 +231 @@
         pVMMDevState->u32GuestFilterMask &= ~u32NotMask;
         vmmdevMaybeSetIRQ_EMT (pVMMDevState);
+    }
+}
+
+void VMMDevCtlSetGuestFilterMask (VMMDevState *pVMMDevState,
+                                  uint32_t u32OrMask,
+                                  uint32_t u32NotMask)
+{
+    PPDMDEVINS pDevIns = VMMDEVSTATE_2_DEVINS(pVMMDevState);
+    PVM pVM = PDMDevHlpGetVM(pDevIns);
+
+#ifdef DEBUG_sunlover
+    Log(("VMMDevCtlSetGuestFilterMask: u32OrMask = 0x%08X, u32NotMask = 0x%08X.\n", u32OrMask, u32NotMask));
+#endif /* DEBUG_sunlover */
+
+    if (VM_IS_EMT(pVM))
+    {
+        vmmdevCtlGuestFilterMask_EMT (pVMMDevState, u32OrMask, u32NotMask);
+    }
+    else
+    {
+        int rc;
+        PVMREQ pReq;
+
+        rc = VMR3ReqCallVoid (pVM, &pReq, RT_INDEFINITE_WAIT,
+                              (PFNRT) vmmdevCtlGuestFilterMask_EMT,
+                              3, pVMMDevState, u32OrMask, u32NotMask);
+        AssertReleaseRC (rc);
+        VMR3ReqFree (pReq);
     }
 }
@@ -898 +927 @@
 
                 pCtlMaskRequest = (VMMDevCtlGuestFilterMask *) requestHeader;
+                /* The HGCM events are enabled by the VMMDev device automatically when any
+                 * HGCM command is issued. The guest then can not disable these events.
+                 */
                 vmmdevCtlGuestFilterMask_EMT (pData,
                                               pCtlMaskRequest->u32OrMask,
-                                              pCtlMaskRequest->u32NotMask);
+                                              pCtlMaskRequest->u32NotMask & ~VMMDEV_EVENT_HGCM);
                 requestHeader->rc = VINF_SUCCESS;
 
@@ -1777 +1809 @@
     rc = RTCritSectInit(&pData->critsectHGCMCmdList);
     AssertRCReturn(rc, rc);
-    pData->u32HGCMRefs = 0;
+    pData->u32HGCMEnabled = 0;
 #endif /* VBOX_HGCM */
 

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

@@ -132 +132 @@
             || enmCmdType == VBOXHGCMCMDTYPE_CALL)
         {
-            uint32_t u32 = ASMAtomicIncU32 (&pVMMDevState->u32HGCMRefs);
-            Assert(u32 != 0);
-            vmmdevCtlGuestFilterMask_EMT (pVMMDevState, VMMDEV_EVENT_HGCM, 0);
+            if (ASMAtomicCmpXchgU32(&pVMMDevState->u32HGCMEnabled, 1, 0))
+            {
+                 VMMDevCtlSetGuestFilterMask (pVMMDevState, VMMDEV_EVENT_HGCM, 0);
+            }
         }
 
@@ -169 +170 @@
         {
             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

@@ -148 +148 @@
     /** Critical section to protect the list. */
     RTCRITSECT critsectHGCMCmdList;
-    /** How many HGCM commands are pending. */
-    volatile uint32_t u32HGCMRefs;
+    /** Whether the HGCM events are already automatically enabled. */
+    uint32_t u32HGCMEnabled;
 #endif /* VBOX_HGCM */
 
@@ -155 +155 @@
 
 void VMMDevNotifyGuest (VMMDevState *pVMMDevState, uint32_t u32EventMask);
-void vmmdevCtlGuestFilterMask_EMT (VMMDevState *pVMMDevState,
-                                   uint32_t u32OrMask,
-                                   uint32_t u32NotMask);
+void VMMDevCtlSetGuestFilterMask (VMMDevState *pVMMDevState,
+                                  uint32_t u32OrMask,
+                                  uint32_t u32NotMask);
 
 #endif /* __VMMDevState_h__ */