Changeset 40276 in vbox

Timestamp:

Feb 28, 2012 1:50:09 PM (13 years ago)

Author:

vboxsync

Message:

Main/Console: fix deadlock when a VM triggers saving its own state, regression from locking cleanup

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)

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

@@ -2629 +2629 @@
     if (mMachineState == MachineState_Running)
     {
-        HRESULT rc = Pause();
-        if (FAILED(rc))
-            return rc;
+        /* get the VM handle. */
+        SafeVMPtr ptrVM(this);
+        if (!ptrVM.isOk())
+            return ptrVM.rc();
+
+        /* release the lock before a VMR3* call (EMT will call us back)! */
+        alock.release();
+        int vrc = VMR3Suspend(ptrVM);
+        alock.acquire();
+
+        HRESULT hrc = S_OK;
+        if (RT_FAILURE(vrc))
+            hrc = setError(VBOX_E_VM_ERROR, tr("Could not suspend the machine execution (%Rrc)"), vrc);
+        if (FAILED(hrc))
+            return hrc;
     }
 
@@ -2727 +2739 @@
             setMachineStateLocally(MachineState_Paused);
             /* restore the running state if appropriate */
-            Resume();
+            SafeVMPtr ptrVM(this);
+            if (ptrVM.isOk())
+            {
+                alock.release();
+                VMR3Resume(ptrVM);
+                alock.acquire();
+            }
         }
         else