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

Timestamp:

Oct 15, 2008 8:55:16 PM (17 years ago)

Author:

vboxsync

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

37976

Message:

Storage: Replace the assertions in the construction code with runtime errors because it is possible that hard disks are not accessible. Also fix a assertion because of a unitiallized semaphore in the IDE controller code

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevATA.cpp (modified) (2 diffs)
• DrvBlock.cpp (modified) (1 diff)
• DrvVD.cpp (modified) (1 diff)

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

@@ -5010 +5010 @@
         {
             pCtl = &pThis->aCts[i];
-            fAllIdle &= ataAsyncIOIsIdle(pCtl, false);
-            if (!fAllIdle)
-                break;
+
+            /*
+             * Only check if the thread is idling if the request mutex is set up.
+             * It is possible that the creation of the first controller failed and that
+             * the request mutex is not initialized on the second one yet
+             * But it would be called without the following check.
+             */
+            if (pCtl->AsyncIORequestMutex != NIL_RTSEMEVENT)
+            {
+                fAllIdle &= ataAsyncIOIsIdle(pCtl, false);
+                if (!fAllIdle)
+                    break;
+            }
         }
         if (    fAllIdle
@@ -5956 +5966 @@
             else
             {
-                AssertMsgFailed(("Failed to attach LUN#%d. rc=%Rrc\n", pIf->iLUN, rc));
                 switch (rc)
                 {

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

@@ -872 +872 @@
         return VINF_SUCCESS;
     if (RT_FAILURE(rc))
-    {
-        AssertLogRelMsgFailed(("Failed to attach driver below us! rc=%Rra\n", rc));
-        return rc;
-    }
+        return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                   N_("Failed to attach driver below us! rc=%Rra\n"), rc);
+
     pThis->pDrvMedia = (PPDMIMEDIA)pBase->pfnQueryInterface(pBase, PDMINTERFACE_MEDIA);
     if (!pThis->pDrvMedia)

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

@@ -811 +811 @@
         else
         {
-           AssertMsgFailed(("Failed to open image '%s' rc=%Rrc\n", pszName, rc));
+           rc = PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS,
+                                    N_("Failed to open image '%s' in %s mode rc=%Rrc\n"), pszName,
+                                    (uOpenFlags & VD_OPEN_FLAGS_READONLY) ? "readonly" : "read-write", rc);
            break;
         }