Changeset 96137 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 11, 2022 2:35:45 PM (2 years ago)

Author:

vboxsync

Message:

Recording/Main: Propagate errors further up, to let clients ask IRecordingSettings directly what actually went wrong via IVirtualBoxErrorInfo. ​bugref:10275

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (6 diffs)
• src-client/Recording.cpp (modified) (1 diff)
• src-server/RecordingSettingsImpl.cpp (modified) (4 diffs)

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

@@ -5874 +5874 @@
  * Enables or disables recording of a VM.
  *
- * @returns IPRT status code. Will return VERR_NO_CHANGE if the recording state has not been changed.
+ * @returns VBox status code.
+ * @retval  VERR_NO_CHANGE if the recording state has not been changed.
  * @param   fEnable             Whether to enable or disable the recording.
  * @param   pAutoLock           Pointer to auto write lock to use for attaching/detaching required driver(s) at runtime.
@@ -5909 +5910 @@
                             if (RT_SUCCESS(vrc))
                                 vrc = mRecording.mAudioRec->doAttachDriverViaEmt(ptrVM.rawUVM(), ptrVM.vtable(), pAutoLock);
+
+                            if (RT_FAILURE(vrc))
+                                setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Attaching to audio recording driver failed (%Rrc) -- please consult log file for details"), vrc);
                         }
 # endif
@@ -5916 +5920 @@
                             vrc = pDisplay->i_recordingInvalidate();
                             if (RT_SUCCESS(vrc))
+                            {
                                 vrc = i_recordingStart(pAutoLock);
+                                if (RT_FAILURE(vrc))
+                                    setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording start failed (%Rrc) -- please consult log file for details"), vrc);
+                            }
                         }
                     }
+                    else
+                        setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording initialization failed (%Rrc) -- please consult log file for details"), vrc);
 
                     if (RT_FAILURE(vrc))
@@ -5925 +5935 @@
                 else
                 {
-                    i_recordingStop(pAutoLock);
+                    vrc = i_recordingStop(pAutoLock);
+                    if (RT_SUCCESS(vrc))
+                    {
 # ifdef VBOX_WITH_AUDIO_RECORDING
-                    if (mRecording.mAudioRec)
-                        mRecording.mAudioRec->doDetachDriverViaEmt(ptrVM.rawUVM(), ptrVM.vtable(), pAutoLock);
+                        if (mRecording.mAudioRec)
+                            mRecording.mAudioRec->doDetachDriverViaEmt(ptrVM.rawUVM(), ptrVM.vtable(), pAutoLock);
 # endif
-                    i_recordingDestroy();
+                        i_recordingDestroy();
+                    }
+                    else
+                       setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording stop failed (%Rrc) -- please consult log file for details"), vrc);
                 }
             }
@@ -5940 +5955 @@
         }
         else /* Should not happen. */
+        {
             vrc = VERR_NO_CHANGE;
+            setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording already %s"), fIsEnabled ? tr("enabled") : tr("disabled"));
+        }
     }
 
@@ -5971 +5989 @@
             ::FireRecordingChangedEvent(mEventSource);
         }
-
+        else /* Error set via ErrorInfo within i_recordingEnable() already. */
+            rc = VBOX_E_IPRT_ERROR;
         ptrVM.release();
     }

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

@@ -198 +198 @@
             break;
         }
+        catch (int vrc_thrown) /* Catch rc thrown by constructor. */
+        {
+            vrc = vrc_thrown;
+            break;
+        }
 
         ++itScreen;

trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

@@ -246 +246 @@
     const bool fEnabled = RT_BOOL(enable);
 
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     if (m->bd->fEnabled != fEnabled)
@@ -255 +255 @@
         alock.release();
 
-        rc = m->pMachine->i_onRecordingChange(enable);
-        if (FAILED(rc))
-        {
+        hrc = m->pMachine->i_onRecordingChange(enable);
+        if (FAILED(hrc))
+        {
+            com::ErrorInfo errMachine; /* Get error info from machine call above. */
+
             /*
              * Normally we would do the actual change _after_ i_onRecordingChange() succeeded.
@@ -266 +268 @@
             alock.acquire();
             m->bd->fEnabled = m->bd.backedUpData()->fEnabled;
+
+            if (errMachine.isBasicAvailable())
+                hrc = setError(errMachine);
         }
         else
@@ -278 +283 @@
             /** Save settings if online - @todo why is this required? -- @bugref{6818} */
             if (Global::IsOnline(m->pMachine->i_getMachineState()))
-                rc = m->pMachine->i_saveSettings(NULL, mlock);
-        }
-    }
-
-    return rc;
+            {
+                com::ErrorInfo errMachine;
+                hrc = m->pMachine->i_saveSettings(NULL, mlock);
+                if (FAILED(hrc))
+                {
+                    /* Got error info from machine call above. */
+                    if (errMachine.isBasicAvailable())
+                        hrc = setError(errMachine);
+                }
+            }
+        }
+    }
+
+    return hrc;
 }