Changeset 34452 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 29, 2010 11:20:09 AM (14 years ago)

Author:

vboxsync

Message:

SCSI: Fix crash on startup

File:

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

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

@@ -735 +735 @@
 static DECLCALLBACK(int) drvscsiConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    int rc = VINF_SUCCESS;
     PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
     LogFlowFunc(("pDrvIns=%#p pCfg=%#p\n", pDrvIns, pCfg));
@@ -750 +751 @@
     pThis->IPortAsync.pfnTransferCompleteNotify = drvscsiTransferCompleteNotify;
 
+    /* Query the SCSI port interface above. */
+    pThis->pDevScsiPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMISCSIPORT);
+    AssertMsgReturn(pThis->pDevScsiPort, ("Missing SCSI port interface above\n"), VERR_PDM_MISSING_INTERFACE);
+
+    /* Query the optional LED interface above. */
+    pThis->pLedPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMILEDPORTS);
+    if (pThis->pLedPort != NULL)
+    {
+        /* Get The Led. */
+        rc = pThis->pLedPort->pfnQueryStatusLed(pThis->pLedPort, 0, &pThis->pLed);
+        if (RT_FAILURE(rc))
+            pThis->pLed = &pThis->Led;
+    }
+    else
+        pThis->pLed = &pThis->Led;
+
     /*
      * Try attach driver below and query it's block interface.
      */
-    int rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pThis->pDrvBase);
+    rc = PDMDrvHlpAttach(pDrvIns, fFlags, &pThis->pDrvBase);
     AssertMsgReturn(RT_SUCCESS(rc), ("Attaching driver below failed rc=%Rrc\n", rc), rc);
 
@@ -772 +789 @@
     }
 
-    /* Query the SCSI port interface above. */
-    pThis->pDevScsiPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMISCSIPORT);
-    AssertMsgReturn(pThis->pDevScsiPort, ("Missing SCSI port interface above\n"), VERR_PDM_MISSING_INTERFACE);
-
     pThis->pDrvMount = PDMIBASE_QUERY_INTERFACE(pThis->pDrvBase, PDMIMOUNT);
-
-    /* Query the optional LED interface above. */
-    pThis->pLedPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMILEDPORTS);
-    if (pThis->pLedPort != NULL)
-    {
-        /* Get The Led. */
-        rc = pThis->pLedPort->pfnQueryStatusLed(pThis->pLedPort, 0, &pThis->pLed);
-        if (RT_FAILURE(rc))
-            pThis->pLed = &pThis->Led;
-    }
-    else
-        pThis->pLed = &pThis->Led;
 
     /* Try to get the optional async block interface. */