Changeset 11844 in vbox

Timestamp:

Aug 29, 2008 6:47:01 PM (16 years ago)

Author:

vboxsync

Message:

Do not call HGCM after it has been shut down.

Location:

trunk/src/VBox/Main

Files:

• VMMDevInterface.cpp (modified) (5 diffs)
• include/VMMDev.h (modified) (1 diff)

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -520 +520 @@
     }
 
+    if (!pDrv->pVMMDev->hgcmIsActive ())
+    {
+        return VERR_INVALID_STATE;
+    }
+
     return HGCMGuestConnect (pDrv->pHGCMPort, pCmd, pServiceLocation->u.host.achName, pu32ClientID);
 }
@@ -528 +533 @@
 
     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    if (!pDrv->pVMMDev->hgcmIsActive ())
+    {
+        return VERR_INVALID_STATE;
+    }
 
     return HGCMGuestDisconnect (pDrv->pHGCMPort, pCmd, u32ClientID);
@@ -538 +548 @@
 
     PDRVMAINVMMDEV pDrv = PDMIHGCMCONNECTOR_2_MAINVMMDEV(pInterface);
+
+    if (!pDrv->pVMMDev->hgcmIsActive ())
+    {
+        return VERR_INVALID_STATE;
+    }
 
     return HGCMGuestCall (pDrv->pHGCMPort, pCmd, u32ClientID, u32Function, cParms, paParms);
@@ -576 +591 @@
 int VMMDev::hgcmLoadService (const char *pszServiceLibrary, const char *pszServiceName)
 {
-    if (ASMAtomicReadBool(&m_fHGCMActive) == false)
+    if (!hgcmIsActive ())
     {
         return VERR_INVALID_STATE;
@@ -586 +601 @@
                           uint32_t cParms, PVBOXHGCMSVCPARM paParms)
 {
-    if (ASMAtomicReadBool(&m_fHGCMActive) == false)
+    if (!hgcmIsActive ())
     {
         return VERR_INVALID_STATE;

trunk/src/VBox/Main/include/VMMDev.h

@@ -57 +57 @@
     void hgcmShutdown (void);
 
+    bool hgcmIsActive (void) { return ASMAtomicReadBool(&m_fHGCMActive); }
+
 private:
     static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, PDMINTERFACE enmInterface);