Changeset 29213 in vbox

Timestamp:

May 7, 2010 1:56:43 PM (15 years ago)

Author:

vboxsync

Message:

DrvSCSI: Fix crash when an error occurs and print errors in the release log

File:

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

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

@@ -33 +33 @@
 
 #include "Builtins.h"
+
+/** The maximum number of release log entries per device. */
+#define MAX_LOG_REL_ERRORS  1024
 
 /**
@@ -98 +101 @@
     /** Release statistics: Current I/O depth. */
     volatile uint32_t       StatIoDepth;
+    /** Errors printed in the release log. */
+    unsigned                cErrors;
 } DRVSCSI, *PDRVSCSI;
 
@@ -231 +236 @@
             {
                 rc = pThis->pDrvBlockAsync->pfnStartFlush(pThis->pDrvBlockAsync, hVScsiIoReq);
-                if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
-                    AssertMsgFailed(("%s: Failed to flush data %Rrc\n", __FUNCTION__, rc));
+                if (   RT_FAILURE(rc)
+                    && rc != VERR_VD_ASYNC_IO_IN_PROGRESS
+                    && pThis->cErrors++ < MAX_LOG_REL_ERRORS)
+                    LogRel(("SCSI#%u: Flush returned rc=%Rrc\n",
+                            pThis->pDrvIns->iInstance, rc));
                 break;
             }
@@ -254 +262 @@
                                                              paSeg, cSeg, cbTransfer,
                                                              hVScsiIoReq);
-                    if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
-                        AssertMsgFailed(("%s: Failed to read data %Rrc\n", __FUNCTION__, rc));
                     STAM_REL_COUNTER_ADD(&pThis->StatBytesRead, cbTransfer);
                 }
@@ -264 +270 @@
                                                               paSeg, cSeg, cbTransfer,
                                                               hVScsiIoReq);
-                    if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
-                        AssertMsgFailed(("%s: Failed to write data %Rrc\n", __FUNCTION__, rc));
                     STAM_REL_COUNTER_ADD(&pThis->StatBytesWritten, cbTransfer);
                 }
 
+                if (   RT_FAILURE(rc)
+                    && rc != VERR_VD_ASYNC_IO_IN_PROGRESS
+                    && pThis->cErrors++ < MAX_LOG_REL_ERRORS)
+                    LogRel(("SCSI#%u: %s at offset %llu (%u bytes left) returned rc=%Rrc\n",
+                            pThis->pDrvIns->iInstance,
+                            enmTxDir == VSCSIIOREQTXDIR_READ
+                            ? "Read"
+                            : "Write",
+                            uOffset,
+                            cbTransfer, rc));
                 break;
             }
@@ -300 +314 @@
             ASMAtomicDecU32(&pThis->StatIoDepth);
             VSCSIIoReqCompleted(hVScsiIoReq, rc);
+            rc = VINF_SUCCESS;
         }
         else