Changeset 91875 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 20, 2021 9:15:43 AM (3 years ago)

Author:

vboxsync

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

147678

Message:

Devices/Storage: Change the storage drivers to access the CFGM API through the driver helper callback table only, bugref:10074 [build fix]

File:

• trunk/src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -1327 +1327 @@
 static DECLCALLBACK(int) drvscsiConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
-    int rc = VINF_SUCCESS;
+    RT_NOREF(pCfg);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
     LogFlowFunc(("pDrvIns=%#p pCfg=%#p\n", pDrvIns, pCfg));
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*
@@ -1406 +1406 @@
     {
         /* Get The Led. */
-        rc = pThis->pLedPort->pfnQueryStatusLed(pThis->pLedPort, 0, &pThis->pLed);
+        int rc = pThis->pLedPort->pfnQueryStatusLed(pThis->pLedPort, 0, &pThis->pLed);
         if (RT_FAILURE(rc))
             pThis->pLed = &pThis->Led;
@@ -1421 +1421 @@
      * Try attach driver below and query it's media interface.
      */
-    rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pThis->pDrvBase);
+    int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pThis->pDrvBase);
     if (RT_FAILURE(rc))
         return rc;