Changeset 77814 in vbox for trunk

Timestamp:

Mar 20, 2019 6:38:04 PM (6 years ago)

Author:

vboxsync

Message:

Main/ConsoleImpl.cpp/powerUp: Moved VRDE audio driver attaching and enabling recording to _after_ we've checked that VMR3Create succeeded, as it's begging for deadlocks to do it earlier since both may try talk to EMT (there is no EMT if VMR3Create failed). Also fixed error handling to not use AssertComRCReturnVoid() as that would leave everything dangling in limbo. Completely untested. bugref:9374

File:

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

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

@@ -10139 +10139 @@
                          &pVM, NULL);
         alock.acquire();
-
-#ifdef VBOX_WITH_AUDIO_VRDE
-        /* Attach the VRDE audio driver. */
-        IVRDEServer *pVRDEServer = pConsole->i_getVRDEServer();
-        if (pVRDEServer)
-        {
-            BOOL fVRDEEnabled = FALSE;
-            rc = pVRDEServer->COMGETTER(Enabled)(&fVRDEEnabled);
-            AssertComRCReturnVoid(rc);
-
-            if (   fVRDEEnabled
-                && pConsole->mAudioVRDE)
-                pConsole->mAudioVRDE->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
-        }
-#endif
-
-        /* Enable client connections to the VRDP server. */
-        pConsole->i_consoleVRDPServer()->EnableConnections();
-
-#ifdef VBOX_WITH_RECORDING
-        ComPtr<IRecordingSettings> recordingSettings;
-        rc = pConsole->mMachine->COMGETTER(RecordingSettings)(recordingSettings.asOutParam());
-        AssertComRCReturnVoid(rc);
-
-        BOOL fRecordingEnabled;
-        rc = recordingSettings->COMGETTER(Enabled)(&fRecordingEnabled);
-        AssertComRCReturnVoid(rc);
-
-        if (fRecordingEnabled)
-        {
-            int vrc2 = pConsole->i_recordingEnable(fRecordingEnabled, &alock);
-            if (RT_SUCCESS(vrc2))
-            {
-                fireRecordingChangedEvent(pConsole->mEventSource);
-            }
-            else
-               LogRel(("Recording: Failed with %Rrc on VM power up\n", vrc2));
-
-            /** Note: Do not use vrc here, as starting the video recording isn't critical to
-             *        powering up the VM. */
-        }
-#endif
-
         if (RT_SUCCESS(vrc))
         {
@@ -10241 +10198 @@
                 }
 
+#ifdef VBOX_WITH_AUDIO_VRDE
+                /*
+                 * Attach the VRDE audio driver.
+                 */
+                if (pConsole->i_getVRDEServer())
+                {
+                    BOOL fVRDEEnabled = FALSE;
+                    rc = pConsole->i_getVRDEServer()->COMGETTER(Enabled)(&fVRDEEnabled);
+                    AssertComRCBreak(rc, RT_NOTHING);
+
+                    if (   fVRDEEnabled
+                        && pConsole->mAudioVRDE)
+                        pConsole->mAudioVRDE->doAttachDriverViaEmt(pConsole->mpUVM, &alock);
+                }
+#endif
+
+                /*
+                 * Enable client connections to the VRDP server.
+                 */
+                pConsole->i_consoleVRDPServer()->EnableConnections();
+
+#ifdef VBOX_WITH_RECORDING
+                /*
+                 * Enable recording if configured.
+                 */
+                BOOL fRecordingEnabled = FALSE;
+                {
+                    ComPtr<IRecordingSettings> ptrRecordingSettings;
+                    rc = pConsole->mMachine->COMGETTER(RecordingSettings)(ptrRecordingSettings.asOutParam());
+                    AssertComRCBreak(rc, RT_NOTHING);
+
+                    rc = ptrRecordingSettings->COMGETTER(Enabled)(&fRecordingEnabled);
+                    AssertComRCBreak(rc, RT_NOTHING);
+                }
+                if (fRecordingEnabled)
+                {
+                    vrc = pConsole->i_recordingEnable(fRecordingEnabled, &alock);
+                    if (RT_SUCCESS(vrc))
+                        fireRecordingChangedEvent(pConsole->mEventSource);
+                    else
+                    {
+                        LogRel(("Recording: Failed with %Rrc on VM power up\n", vrc));
+                        vrc = VINF_SUCCESS; /* do not fail with broken recording */
+                    }
+                }
+#endif
+
                 /* release the lock before a lengthy operation */
                 alock.release();
@@ -10254 +10258 @@
                 }
 
-                /* Load saved state? */
+                /*
+                 * Load saved state?
+                 */
                 if (pTask->mSavedStateFile.length())
                 {
@@ -10263 +10269 @@
                                            Console::i_stateProgressCallback,
                                            static_cast<IProgress *>(pTask->mProgress));
-
                     if (RT_SUCCESS(vrc))
                     {