Changeset 88906 in vbox for trunk/src/VBox

Timestamp:

May 6, 2021 2:24:47 PM (4 years ago)

Author:

vboxsync

Message:

Audio/Dev*: Overhauled the attach/detach code a little, making attach fail if the configured driver doesn't have a PDMIADUIOCONNECTOR interface among other things. [more] bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevIchAc97.cpp (modified) (6 diffs)
• DevSB16.cpp (modified) (5 diffs)

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

@@ -3921 +3921 @@
 
 /**
- * Attach command, internal version.
- *
- * This is called to let the device attach to a driver for a specified LUN
- * during runtime. This is not called during VM construction, the device
- * constructor has to attach to all the available drivers.
+ * Worker for ichac97R3Construct() and ichac97R3Attach().
  *
  * @returns VBox status code.
@@ -3931 +3927 @@
  * @param   pThisCC     The ring-3 AC'97 device state.
  * @param   iLun        The logical unit which is being attached.
- * @param   fFlags      Flags, combination of the PDMDEVATT_FLAGS_* \#defines.
  * @param   ppDrv       Attached driver instance on success. Optional.
  */
-static int ichac97R3AttachInternal(PPDMDEVINS pDevIns, PAC97STATER3 pThisCC, unsigned iLun, uint32_t fFlags, PAC97DRIVER *ppDrv)
-{
-    RT_NOREF(fFlags);
-
+static int ichac97R3AttachInternal(PPDMDEVINS pDevIns, PAC97STATER3 pThisCC, unsigned iLun, PAC97DRIVER *ppDrv)
+{
     /*
      * Attach driver.
@@ -3977 +3970 @@
                 if (ppDrv)
                     *ppDrv = pDrv;
-                LogFunc(("iLun=%u, fFlags=0x%x: VINF_SUCCESS\n", iLun, fFlags));
+                LogFunc(("LUN#%u: VINF_SUCCESS\n", iLun));
                 return VINF_SUCCESS;
             }
@@ -3992 +3985 @@
 
     RTStrFree(pszDesc);
-    LogFunc(("iLun=%u, fFlags=0x%x: rc=%Rrc\n", iLun, fFlags, rc));
+    LogFunc(("LUN#%u: rc=%Rrc\n", iLun, rc));
     return rc;
 }
@@ -4003 +3996 @@
     PAC97STATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PAC97STATE);
     PAC97STATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PAC97STATER3);
-
-    LogFunc(("iLUN=%u, fFlags=0x%x\n", iLUN, fFlags));
+    RT_NOREF(fFlags);
+    LogFunc(("iLUN=%u, fFlags=%#x\n", iLUN, fFlags));
 
     DEVAC97_LOCK(pDevIns, pThis);
 
     PAC97DRIVER pDrv;
-    int rc = ichac97R3AttachInternal(pDevIns, pThisCC, iLUN, fFlags, &pDrv);
+    int rc = ichac97R3AttachInternal(pDevIns, pThisCC, iLUN, &pDrv);
     if (RT_SUCCESS(rc))
     {
@@ -4282 +4275 @@
         AssertBreak(iLun < UINT8_MAX);
         LogFunc(("Trying to attach driver for LUN#%u ...\n", iLun));
-        rc = ichac97R3AttachInternal(pDevIns, pThisCC, iLun, 0 /* fFlags */, NULL /* ppDrv */);
+        rc = ichac97R3AttachInternal(pDevIns, pThisCC, iLun, NULL /* ppDrv */);
         if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         {

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

@@ -2850 +2850 @@
 
 /**
- * Attach command, internal version.
- *
- * This is called to let the device attach to a driver for a specified LUN
- * during runtime. This is not called during VM construction, the device
- * constructor has to attach to all the available drivers.
+ * Worker for sb16Construct() and sb16Attach().
  *
  * @returns VBox status code.
  * @param   pThis       SB16 state.
  * @param   uLUN        The logical unit which is being detached.
- * @param   fFlags      Flags, combination of the PDMDEVATT_FLAGS_* \#defines.
  * @param   ppDrv       Attached driver instance on success. Optional.
  */
-static int sb16AttachInternal(PSB16STATE pThis, unsigned uLUN, uint32_t fFlags, PSB16DRIVER *ppDrv)
-{
-    RT_NOREF(fFlags);
-
+static int sb16AttachInternal(PSB16STATE pThis, unsigned uLUN, PSB16DRIVER *ppDrv)
+{
     /*
      * Allocate a new driver structure and try attach the driver.
@@ -2903 +2896 @@
             if (ppDrv)
                 *ppDrv = pDrv;
-            LogFunc(("iLUN=%u, fFlags=0x%x: VINF_SUCCESS\n", uLUN, fFlags));
+            LogFunc(("LUN#%u: VINF_SUCCESS\n", uLUN));
             return VINF_SUCCESS;
         }
@@ -2914 +2907 @@
     RTMemFree(pDrv);
 
-    LogFunc(("iLUN=%u, fFlags=0x%x: rc=%Rrc\n", uLUN, fFlags, rc));
+    LogFunc(("LUN#%u: rc=%Rrc\n", uLUN, rc));
     return rc;
 }
@@ -2924 +2917 @@
 {
     PSB16STATE pThis = PDMDEVINS_2_DATA(pDevIns, PSB16STATE);
-
-    LogFunc(("iLUN=%u, fFlags=0x%x\n", iLUN, fFlags));
+    RT_NOREF(fFlags);
+    LogFunc(("iLUN=%u, fFlags=%#x\n", iLUN, fFlags));
 
     /** @todo r=andy Any locking required here? */
 
     PSB16DRIVER pDrv;
-    int rc = sb16AttachInternal(pThis, iLUN, fFlags, &pDrv);
+    int rc = sb16AttachInternal(pThis, iLUN, &pDrv);
     if (RT_SUCCESS(rc))
     {
@@ -3263 +3256 @@
         AssertBreak(iLun < UINT8_MAX);
         LogFunc(("Trying to attach driver for LUN#%u ...\n", iLun));
-        rc = sb16AttachInternal(pThis, iLun, 0 /* fFlags */, NULL /* ppDrv */);
+        rc = sb16AttachInternal(pThis, iLun, NULL /* ppDrv */);
         if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
         {