Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 59375) +++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 59376) @@ -2280,9 +2280,18 @@ } -static int ichac97Reattach(PAC97STATE pThis, PCFGMNODE pCfg, PAC97DRIVER pDrv, const char *pszDriver) +/** + * Re-attach. + * + * @returns VBox status code. + * @param pThis Device instance. + * @param pDrv Driver instance used for attaching to. + * If NULL is specified, a new driver will be created and appended + * to the driver list. + * @param uLUN The logical unit which is being re-detached. + * @param pszDriver Driver name. + */ +static int ichac97Reattach(PAC97STATE pThis, PAC97DRIVER pDrv, uint8_t uLUN, const char *pszDriver) { AssertPtrReturn(pThis, VERR_INVALID_POINTER); - AssertPtrReturn(pCfg, VERR_INVALID_POINTER); - AssertPtrReturn(pDrv, VERR_INVALID_POINTER); AssertPtrReturn(pszDriver, VERR_INVALID_POINTER); @@ -2292,16 +2301,21 @@ /* Remove LUN branch. */ - CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", pDrv->uLUN)); - - int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); - if (RT_FAILURE(rc)) - return rc; + CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN)); + + if (pDrv) + { + /* Re-use a driver instance => detach the driver before. */ + int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); + if (RT_FAILURE(rc)) + return rc; + } #define RC_CHECK() if (RT_FAILURE(rc)) { AssertReleaseRC(rc); break; } + int rc = VINF_SUCCESS; do { PCFGMNODE pLunL0; - rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", pDrv->uLUN); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", uLUN); RC_CHECK(); rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); rc = CFGMR3InsertNode(pLunL0, "Config/", NULL); RC_CHECK(); @@ -2317,7 +2331,7 @@ if (RT_SUCCESS(rc)) - rc = ichac97AttachInternal(pThis->pDevInsR3, pDrv, pDrv->uLUN, 0 /* fFlags */); - - LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, pDrv->uLUN, pszDriver, rc)); + rc = ichac97AttachInternal(pThis->pDevInsR3, pDrv, uLUN, 0 /* fFlags */); + + LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, uLUN, pszDriver, rc)); #undef RC_CHECK @@ -2448,5 +2462,5 @@ */ uint8_t uLUN; - for (uLUN = 0; uLUN < UINT8_MAX; uLUN) + for (uLUN = 0; uLUN < UINT8_MAX; ++uLUN) { LogFunc(("Trying to attach driver for LUN #%RU8 ...\n", uLUN)); @@ -2456,8 +2470,15 @@ if (rc == VERR_PDM_NO_ATTACHED_DRIVER) rc = VINF_SUCCESS; - break; - } - - uLUN++; + else if (rc == VERR_AUDIO_BACKEND_INIT_FAILED) + { + ichac97Reattach(pThis, NULL /* pDrv */, uLUN, "NullAudio"); + PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding", + N_("No audio devices could be opened. Selecting the NULL audio backend " + "with the consequence that no sound is audible")); + /* attaching to the NULL audio backend will never fail */ + rc = VINF_SUCCESS; + } + break; + } } @@ -2531,5 +2552,5 @@ ichac97Reset(pDevIns); - ichac97Reattach(pThis, pCfg, pDrv, "NullAudio"); + ichac97Reattach(pThis, pDrv, pDrv->uLUN, "NullAudio"); PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding", Index: /trunk/src/VBox/Devices/Audio/DevIchHda.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchHda.cpp (revision 59375) +++ /trunk/src/VBox/Devices/Audio/DevIchHda.cpp (revision 59376) @@ -4412,9 +4412,18 @@ } -static int hdaReattach(PHDASTATE pThis, PCFGMNODE pCfg, PHDADRIVER pDrv, const char *pszDriver) +/** + * Re-attach. + * + * @returns VBox status code. + * @param pThis Device instance. + * @param pDrv Driver instance used for attaching to. + * If NULL is specified, a new driver will be created and appended + * to the driver list. + * @param uLUN The logical unit which is being re-detached. + * @param pszDriver Driver name. + */ +static int hdaReattach(PHDASTATE pThis, PHDADRIVER pDrv, uint8_t uLUN, const char *pszDriver) { AssertPtrReturn(pThis, VERR_INVALID_POINTER); - AssertPtrReturn(pCfg, VERR_INVALID_POINTER); - AssertPtrReturn(pDrv, VERR_INVALID_POINTER); AssertPtrReturn(pszDriver, VERR_INVALID_POINTER); @@ -4424,16 +4433,21 @@ /* Remove LUN branch. */ - CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", pDrv->uLUN)); - - int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); - if (RT_FAILURE(rc)) - return rc; + CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN)); + + if (pDrv) + { + /* Re-use a driver instance => detach the driver before. */ + int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); + if (RT_FAILURE(rc)) + return rc; + } #define RC_CHECK() if (RT_FAILURE(rc)) { AssertReleaseRC(rc); break; } + int rc = VINF_SUCCESS; do { PCFGMNODE pLunL0; - rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", pDrv->uLUN); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", uLUN); RC_CHECK(); rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); rc = CFGMR3InsertNode(pLunL0, "Config/", NULL); RC_CHECK(); @@ -4449,7 +4463,7 @@ if (RT_SUCCESS(rc)) - rc = hdaAttachInternal(pThis->pDevInsR3, pDrv, pDrv->uLUN, 0 /* fFlags */); - - LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, pDrv->uLUN, pszDriver, rc)); + rc = hdaAttachInternal(pThis->pDevInsR3, pDrv, uLUN, 0 /* fFlags */); + + LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, uLUN, pszDriver, rc)); #undef RC_CHECK @@ -4610,5 +4624,5 @@ uint8_t uLUN; - for (uLUN = 0; uLUN < UINT8_MAX; uLUN) + for (uLUN = 0; uLUN < UINT8_MAX; ++uLUN) { LogFunc(("Trying to attach driver for LUN #%RU32 ...\n", uLUN)); @@ -4618,9 +4632,15 @@ if (rc == VERR_PDM_NO_ATTACHED_DRIVER) rc = VINF_SUCCESS; - + else if (rc == VERR_AUDIO_BACKEND_INIT_FAILED) + { + hdaReattach(pThis, NULL /* pDrv */, uLUN, "NullAudio"); + PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding", + N_("No audio devices could be opened. Selecting the NULL audio backend " + "with the consequence that no sound is audible")); + /* attaching to the NULL audio backend will never fail */ + rc = VINF_SUCCESS; + } break; } - - uLUN++; } @@ -4735,5 +4755,5 @@ hdaReset(pDevIns); - hdaReattach(pThis, pCfg, pDrv, "NullAudio"); + hdaReattach(pThis, pDrv, pDrv->uLUN, "NullAudio"); PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding", Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 59375) +++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 59376) @@ -296,9 +296,18 @@ } -static int sb16Reattach(PSB16STATE pThis, PCFGMNODE pCfg, PSB16DRIVER pDrv, const char *pszDriver) +/** + * Re-attach. + * + * @returns VBox status code. + * @param pThis Device instance. + * @param pDrv Driver instance used for attaching to. + * If NULL is specified, a new driver will be created and appended + * to the driver list. + * @param uLUN The logical unit which is being re-detached. + * @param pszDriver Driver name. + */ +static int sb16Reattach(PSB16STATE pThis, PSB16DRIVER pDrv, uint8_t uLUN, const char *pszDriver) { AssertPtrReturn(pThis, VERR_INVALID_POINTER); - AssertPtrReturn(pCfg, VERR_INVALID_POINTER); - AssertPtrReturn(pDrv, VERR_INVALID_POINTER); AssertPtrReturn(pszDriver, VERR_INVALID_POINTER); @@ -308,16 +317,21 @@ /* Remove LUN branch. */ - CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", pDrv->uLUN)); - - int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); - if (RT_FAILURE(rc)) - return rc; + CFGMR3RemoveNode(CFGMR3GetChildF(pDev0, "LUN#%u/", uLUN)); + + if (pDrv) + { + /* Re-use the driver instance so detach it before. */ + int rc = PDMDevHlpDriverDetach(pThis->pDevInsR3, PDMIBASE_2_PDMDRV(pDrv->pDrvBase), 0 /* fFlags */); + if (RT_FAILURE(rc)) + return rc; + } #define RC_CHECK() if (RT_FAILURE(rc)) { AssertReleaseRC(rc); break; } + int rc = VINF_SUCCESS; do { PCFGMNODE pLunL0; - rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", pDrv->uLUN); RC_CHECK(); + rc = CFGMR3InsertNodeF(pDev0, &pLunL0, "LUN#%u/", uLUN); RC_CHECK(); rc = CFGMR3InsertString(pLunL0, "Driver", "AUDIO"); RC_CHECK(); rc = CFGMR3InsertNode(pLunL0, "Config/", NULL); RC_CHECK(); @@ -333,7 +347,7 @@ if (RT_SUCCESS(rc)) - rc = sb16AttachInternal(pThis->pDevInsR3, pDrv, pDrv->uLUN, 0 /* fFlags */); - - LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, pDrv->uLUN, pszDriver, rc)); + rc = sb16AttachInternal(pThis->pDevInsR3, pDrv, uLUN, 0 /* fFlags */); + + LogFunc(("pThis=%p, uLUN=%u, pszDriver=%s, rc=%Rrc\n", pThis, uLUN, pszDriver, rc)); #undef RC_CHECK @@ -2265,5 +2279,5 @@ */ uint8_t uLUN; - for (uLUN = 0; uLUN < UINT8_MAX; uLUN) + for (uLUN = 0; uLUN < UINT8_MAX; ++uLUN) { LogFunc(("Trying to attach driver for LUN #%RU8 ...\n", uLUN)); @@ -2273,8 +2287,15 @@ if (rc == VERR_PDM_NO_ATTACHED_DRIVER) rc = VINF_SUCCESS; + else if (rc == VERR_AUDIO_BACKEND_INIT_FAILED) + { + sb16Reattach(pThis, NULL /* pDrv */, uLUN, "NullAudio"); + PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding", + N_("No audio devices could be opened. Selecting the NULL audio backend " + "with the consequence that no sound is audible")); + /* attaching to the NULL audio backend will never fail */ + rc = VINF_SUCCESS; + } break; } - - uLUN++; } @@ -2305,5 +2326,5 @@ sb16ResetLegacy(pThis); - sb16Reattach(pThis, pCfg, pDrv, "NullAudio"); + sb16Reattach(pThis, pDrv, pDrv->uLUN, "NullAudio"); PDMDevHlpVMSetRuntimeError(pDevIns, 0 /*fFlags*/, "HostAudioNotResponding",