Changeset 5272 in vbox for trunk

Timestamp:

Oct 12, 2007 6:02:48 PM (17 years ago)

Author:

vboxsync

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

25266

Message:

Shutdown HGCM services before the VM is powered down.

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (3 diffs)
• VMMDevInterface.cpp (modified) (2 diffs)
• include/VMMDev.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -353 +353 @@
      */
     uninitDependentChildren();
-
-    /* This should be the first, since this may cause detaching remote USB devices. */
-    if (mConsoleVRDPServer)
-    {
-        mConsoleVRDPServer->Stop ();
-        /* Do not delete the mConsoleVRDPServer yet, it could be called
-         * since the VM may be not powered done at the moment.
-         */
-    }
 
     /* power down the VM if necessary */
@@ -3900 +3891 @@
     /*
      *  Stop the VRDP server to prevent new clients connection while VM is being powered off.
-     *  (When called from uninit mConsoleVRDPServer is already destroyed.)
      */
     if (mConsoleVRDPServer)
@@ -3913 +3903 @@
         alock.enter();
     }
+    
+    
+#ifdef VBOX_HGCM
+    /*
+     *  Shutdown HGCM services before stopping the guest, because they might need a cleanup.
+     */
+    if (mVMMDev)
+    {
+        LogFlowThisFunc (("Shutdown HGCM...\n"));
+
+        /* Leave the lock. */
+        alock.leave();
+
+        mVMMDev->hgcmShutdown ();
+
+        alock.enter();
+    }
+#endif /* VBOX_HGCM */
 
     /* First, wait for all mpVM callers to finish their work if necessary */

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -91 +91 @@
 VMMDev::~VMMDev()
 {
-#ifdef VBOX_HGCM
-    HGCMHostShutdown ();
-#endif /* VBOX_HGCM */
     RTSemEventDestroy (mCredentialsEvent);
     if (mpDrv)
@@ -568 +565 @@
     return HGCMHostCall (pszServiceName, u32Function, cParms, paParms);
 }
+
+void VMMDev::hgcmShutdown (void)
+{
+    HGCMHostShutdown ();
+}
+
 #endif /* HGCM */
 

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

@@ -51 +51 @@
     int hgcmLoadService (const char *pszServiceName, const char *pszServiceLibrary);
     int hgcmHostCall (const char *pszServiceName, uint32_t u32Function, uint32_t cParms, PVBOXHGCMSVCPARM paParms);
+    void hgcmShutdown (void);
 
 private: