Changeset 37241 in vbox for trunk/src/VBox

Timestamp:

May 27, 2011 3:37:48 PM (14 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: Avoid lock order inversion issue between the VMM state mutex and the console object.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -621 +621 @@
  * @return  VBox status code.
  * @param   pVM         The VM handle.
+ * @param   pAlock      The automatic lock instance.  This is for when we have
+ *                      to leave it in order to avoid deadlocks (ext packs and
+ *                      more).
  */
 int Console::configConstructorInner(PVM pVM, AutoWriteLock *pAlock)
@@ -2594 +2597 @@
 #undef H
 
+    pAlock->release(); /* Avoid triggering the lock order inversion check. */
+
     /*
      * Register VM state change handler.
@@ -2609 +2614 @@
     if (RT_SUCCESS(rc))
         rc = rc2;
+
+    pAlock->acquire();
 
     LogFlowFunc(("vrc = %Rrc\n", rc));