Changeset 28786 in vbox for trunk/src

Timestamp:

Apr 27, 2010 12:12:36 AM (15 years ago)

Author:

vboxsync

Message:

AHCI: Report errors of completed requests to the guest (not tested yet)

File:

• trunk/src/VBox/Devices/Storage/DevAHCI.cpp (modified) (4 diffs)

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

@@ -4855 +4855 @@
  * @param pAhciPort             Pointer to the port where to request completed.
  * @param pAhciPortTaskState    Pointer to the task which finished.
- */
-static int ahciTransferComplete(PAHCIPort pAhciPort, PAHCIPORTTASKSTATE pAhciPortTaskState)
+ * @param rcReq                 IPRT status code of the completed request.
+ */
+static int ahciTransferComplete(PAHCIPort pAhciPort, PAHCIPORTTASKSTATE pAhciPortTaskState, int rcReq)
 {
     /* Free system resources occupied by the scatter gather list. */
@@ -4862 +4863 @@
         ahciScatterGatherListDestroy(pAhciPort, pAhciPortTaskState);
 
-    pAhciPortTaskState->cmdHdr.u32PRDBC = pAhciPortTaskState->cbTransfer;
-
-    pAhciPortTaskState->uATARegError = 0;
-    pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+    if (RT_FAILURE(rcReq))
+    {
+        pAhciPortTaskState->cmdHdr.u32PRDBC = 0;
+        pAhciPortTaskState->uATARegError = ID_ERR;
+        pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_ERR;
+
+        /* Log the error. */
+        if (pAhciPort->cErrors++ < MAX_LOG_REL_ERRORS)
+        {
+            if (pAhciPortTaskState->enmTxDir == AHCITXDIR_FLUSH)
+                LogRel(("AHCI#%u: Flush returned rc=%Rrc\n",
+                        pAhciPort->iLUN, rcReq));
+            else
+                LogRel(("AHCI#%u: %s at offset %llu (%u bytes left) returned rc=%Rrc\n",
+                        pAhciPort->iLUN,
+                        pAhciPortTaskState->enmTxDir == AHCITXDIR_READ
+                        ? "Read"
+                        : "Write",
+                        pAhciPortTaskState->uOffset,
+                        pAhciPortTaskState->cbTransfer, rcReq));
+        }
+    }
+    else
+    {
+        pAhciPortTaskState->cmdHdr.u32PRDBC = pAhciPortTaskState->cbTransfer;
+
+        pAhciPortTaskState->uATARegError = 0;
+        pAhciPortTaskState->uATARegStatus = ATA_STAT_READY | ATA_STAT_SEEK;
+    }
+
     /* Write updated command header into memory of the guest. */
     PDMDevHlpPhysWrite(pAhciPort->CTX_SUFF(pDevIns), pAhciPortTaskState->GCPhysCmdHdrAddr,
@@ -4930 +4957 @@
              __FUNCTION__, pInterface, pvUser, pAhciPortTaskState->uTag));
 
-    int rc = ahciTransferComplete(pAhciPort, pAhciPortTaskState);
+    int rc = ahciTransferComplete(pAhciPort, pAhciPortTaskState, rcReq);
 
     if (pAhciPort->uActTasksActive == 0 && pAhciPort->pAhciR3->fSignalIdle)
@@ -5354 +5381 @@
             }
             if (rc == VINF_VD_ASYNC_IO_FINISHED)
-                rc = ahciTransferComplete(pAhciPort, pAhciPortTaskState);
+                rc = ahciTransferComplete(pAhciPort, pAhciPortTaskState, VINF_SUCCESS);
 
             if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
-                AssertMsgFailed(("%s: Failed to enqueue command %Rrc\n", __FUNCTION__, rc));
+                rc = ahciTransferComplete(pAhciPort, pAhciPortTaskState, rc);
         }
         else