Changeset 82224 in vbox

Timestamp:

Nov 26, 2019 4:12:30 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

135038

Message:

PDMDevHlp: Adding PDMDevHlpDriverReconfigure[|1|2] for the audio devices to use when falling back on the 'NullAudio' driver. bugref:9218

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (3 diffs)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -1975 +1975 @@
 
 /** Current PDMDEVHLPR3 version number. */
-#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 37, 0)
+#define PDM_DEVHLPR3_VERSION                    PDM_VERSION_MAKE_PP(0xffe7, 38, 0)
 
 /**
@@ -3444 +3444 @@
     DECLR3CALLBACKMEMBER(int, pfnDriverDetach,(PPDMDEVINS pDevIns, PPDMDRVINS pDrvIns, uint32_t fFlags));
 
+    /**
+     * Reconfigures the driver chain for a LUN, detaching any driver currently
+     * present there.
+     *
+     * Caller will have attach it, of course.
+     *
+     * @returns VBox status code.
+     * @param   pDevIns             The device instance.
+     * @param   iLun                The logical unit to reconfigure.
+     * @param   cDepth              The depth of the driver chain. Determins the
+     *                              size of @a papszDrivers and @a papConfigs.
+     * @param   papszDrivers        The names of the drivers to configure in the
+     *                              chain, first entry is the one immediately
+     *                              below the device/LUN
+     * @param   papConfigs          The configurations for each of the drivers
+     *                              in @a papszDrivers array.  NULL entries
+     *                              corresponds to empty 'Config' nodes.  This
+     *                              function will take ownership of non-NULL
+     *                              CFGM sub-trees and set the array member to
+     *                              NULL, so the caller can do cleanups on
+     *                              failure.  This parameter is optional.
+     * @param   fFlags              Reserved, MBZ.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnDriverReconfigure,(PPDMDEVINS pDevIns, uint32_t iLun, uint32_t cDepth,
+                                                    const char * const *papszDrivers, PCFGMNODE *papConfigs, uint32_t fFlags));
+
     /** @name Exported PDM Queue Functions
      * @{ */
@@ -7238 +7264 @@
 
 /**
+ * @copydoc PDMDEVHLPR3::pfnDriverReconfigure
+ */
+DECLINLINE(int) PDMDevHlpDriverReconfigure(PPDMDEVINS pDevIns, uint32_t iLun, uint32_t cDepth,
+                                           const char * const *papszDrivers, PCFGMNODE *papConfigs, uint32_t fFlags)
+{
+    return pDevIns->pHlpR3->pfnDriverReconfigure(pDevIns, iLun, cDepth, papszDrivers, papConfigs, fFlags);
+}
+
+/**
+ * Reconfigures with a single driver reattachement, no config, noflags.
+ * @sa PDMDevHlpDriverReconfigure
+ */
+DECLINLINE(int) PDMDevHlpDriverReconfigure1(PPDMDEVINS pDevIns, uint32_t iLun, const char *pszDriver0)
+{
+    return pDevIns->pHlpR3->pfnDriverReconfigure(pDevIns, iLun, 1, &pszDriver0, NULL, 0);
+}
+
+/**
+ * Reconfigures with a two drivers reattachement, no config, noflags.
+ * @sa PDMDevHlpDriverReconfigure
+ */
+DECLINLINE(int) PDMDevHlpDriverReconfigure2(PPDMDEVINS pDevIns, uint32_t iLun, const char *pszDriver0, const char *pszDriver1)
+{
+    char const * apszDrivers[2];
+    apszDrivers[0] = pszDriver0;
+    apszDrivers[1] = pszDriver1;
+    return pDevIns->pHlpR3->pfnDriverReconfigure(pDevIns, iLun, 2, apszDrivers, NULL, 0);
+}
+
+/**
  * @copydoc PDMDEVHLPR3::pfnQueueCreatePtr
  */

trunk/src/VBox/VMM/VMMR3/PDMDevHlp.cpp

@@ -2503 +2503 @@
 
     LogFlow(("pdmR3DevHlp_DriverDetach: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
+    return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnDriverReconfigure} */
+static DECLCALLBACK(int) pdmR3DevHlp_DriverReconfigure(PPDMDEVINS pDevIns, uint32_t iLun, uint32_t cDepth,
+                                                       const char * const *papszDrivers, PCFGMNODE *papConfigs, uint32_t fFlags)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+    LogFlow(("pdmR3DevHlp_DriverReconfigure: caller='%s'/%d: iLun=%u cDepth=%u fFlags=%#x\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, iLun, cDepth, fFlags));
+
+    /*
+     * Validate input.
+     */
+    AssertReturn(cDepth <= 8, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(papszDrivers, VERR_INVALID_POINTER);
+    AssertPtrNullReturn(papConfigs, VERR_INVALID_POINTER);
+    for (uint32_t i = 0; i < cDepth; i++)
+    {
+        AssertPtrReturn(papszDrivers[i], VERR_INVALID_POINTER);
+        size_t cchDriver = strlen(papszDrivers[i]);
+        AssertPtrReturn(cchDriver > 0 && cchDriver < RT_SIZEOFMEMB(PDMDRVREG, szName), VERR_OUT_OF_RANGE);
+
+        if (papConfigs)
+            AssertPtrNullReturn(papConfigs[i], VERR_INVALID_POINTER);
+    }
+    AssertReturn(fFlags == 0, VERR_INVALID_FLAGS);
+
+    /*
+     * Do we have to detach an existing driver first?
+     */
+    for (PPDMLUN pLun = pDevIns->Internal.s.pLunsR3; pLun; pLun = pLun->pNext)
+        if (pLun->iLun == iLun)
+        {
+            if (pLun->pTop)
+            {
+                int rc = pdmR3DrvDetach(pLun->pTop, 0);
+                AssertRCReturn(rc, rc);
+            }
+            break;
+        }
+
+    /*
+     * Remove the old tree.
+     */
+    PCFGMNODE pCfgDev = CFGMR3GetChildF(CFGMR3GetRoot(pVM), "Devices/%s/%u/", pDevIns->pReg->szName, pDevIns->iInstance);
+    AssertReturn(pCfgDev, VERR_INTERNAL_ERROR_2);
+    PCFGMNODE pCfgLun = CFGMR3GetChildF(pCfgDev, "LUN#%u", iLun);
+    if (pCfgLun)
+        CFGMR3RemoveNode(pCfgLun);
+
+    /*
+     * Construct a new tree.
+     */
+    int rc = CFGMR3InsertNodeF(pCfgDev, &pCfgLun, "LUN#%u", iLun);
+    AssertRCReturn(rc, rc);
+    PCFGMNODE pCfgDrv = pCfgLun;
+    for (uint32_t i = 0; i < cDepth; i++)
+    {
+        rc = CFGMR3InsertString(pCfgDrv, "Driver", papszDrivers[i]);
+        AssertRCReturn(rc, rc);
+        if (papConfigs && papConfigs[i])
+        {
+            rc = CFGMR3InsertSubTree(pCfgDrv, "Config", papConfigs[i], NULL);
+            AssertRCReturn(rc, rc);
+            papConfigs[i] = NULL;
+        }
+        else
+        {
+            rc = CFGMR3InsertNode(pCfgDrv, "Config", NULL);
+            AssertRCReturn(rc, rc);
+        }
+
+        if (i + 1 >= cDepth)
+            break;
+        rc = CFGMR3InsertNode(pCfgDrv, "AttachedDriver", &pCfgDrv);
+        AssertRCReturn(rc, rc);
+    }
+
+    LogFlow(("pdmR3DevHlp_DriverReconfigure: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
 }
@@ -4498 +4581 @@
     pdmR3DevHlp_DriverAttach,
     pdmR3DevHlp_DriverDetach,
+    pdmR3DevHlp_DriverReconfigure,
     pdmR3DevHlp_QueueCreatePtr,
     pdmR3DevHlp_QueueCreate,
@@ -4995 +5079 @@
     pdmR3DevHlp_DriverAttach,
     pdmR3DevHlp_DriverDetach,
+    pdmR3DevHlp_DriverReconfigure,
     pdmR3DevHlp_QueueCreatePtr,
     pdmR3DevHlp_QueueCreate,