Changeset 61568 in vbox

Timestamp:

Jun 8, 2016 9:55:02 AM (8 years ago)

Author:

vboxsync

Message:

Audio/DrvAudio.cpp: Be more gentle for host backend failures.

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DrvAudio.cpp

@@ -957 +957 @@
 #endif
 
-static int drvAudioHostInit(PCFGMNODE pCfgHandle, PDRVAUDIO pThis)
+/**
+ * Initializes the host backend and queries its initial configuration.
+ * If the host backend fails, VERR_AUDIO_BACKEND_INIT_FAILED will be returned.
+ *
+ * Note: As this routine is called when attaching to the device LUN in the
+ *       device emulation, we either check for success or VERR_AUDIO_BACKEND_INIT_FAILED.
+ *       Everything else is considered as fatal and must be handled separately in
+ *       the device emulation!
+ *
+ * @return  IPRT status code.
+ * @param   pThis               Driver instance to be called.
+ * @param   pCfgHandle          CFGM configuration handle to use for this driver.
+ */
+static int drvAudioHostInit(PDRVAUDIO pThis, PCFGMNODE pCfgHandle)
 {
     /* pCfgHandle is optional. */
+    NOREF(pCfgHandle);
     AssertPtrReturn(pThis, VERR_INVALID_POINTER);
-
-    NOREF(pCfgHandle);
 
     LogFlowFuncEnter();
@@ -970 +982 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("Initialization of lower driver failed with rc=%Rrc\n", rc));
-        return rc;
+        LogRel(("Audio: Initialization of host backend failed with %Rrc\n", rc));
+        return VERR_AUDIO_BACKEND_INIT_FAILED;
     }
 
@@ -978 +990 @@
     if (RT_FAILURE(rc))
     {
-        LogFlowFunc(("Getting backend configuration failed with rc=%Rrc\n", rc));
-        return rc;
+        LogRel(("Audio: Getting host backend configuration failed with %Rrc\n", rc));
+        return VERR_AUDIO_BACKEND_INIT_FAILED;
     }
 
@@ -1040 +1052 @@
      */
     if (RT_SUCCESS(rc))
-        rc = drvAudioHostInit(pCfgHandle, pThis);
+        rc = drvAudioHostInit(pThis, pCfgHandle);
 
     LogFlowFuncLeaveRC(rc);