Changeset 28784 in vbox for trunk/src/VBox

Timestamp:

Apr 26, 2010 11:59:42 PM (15 years ago)

Author:

vboxsync

Message:

Interface changes for error reporting and async I/O

Location:

trunk/src/VBox/Devices/Storage

Files:

• DevAHCI.cpp (modified) (1 diff)
• DrvBlock.cpp (modified) (1 diff)
• DrvDiskIntegrity.cpp (modified) (2 diffs)
• DrvSCSI.cpp (modified) (2 diffs)
• DrvVD.cpp (modified) (2 diffs)
• VBoxHDD.cpp (modified) (4 diffs)

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

@@ -4920 +4920 @@
  * @param   pInterface   Pointer to the interface.
  * @param   pvUser       User data.
- */
-static DECLCALLBACK(int) ahciTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser)
+ * @param   rcReq        IPRT Status code of the completed request.
+ */
+static DECLCALLBACK(int) ahciTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rcReq)
 {
     PAHCIPort pAhciPort = PDMIBLOCKASYNCPORT_2_PAHCIPORT(pInterface);

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

@@ -356 +356 @@
 #define PDMIMEDIAASYNCPORT_2_DRVBLOCK(pInterface)    ( (PDRVBLOCK((uintptr_t)pInterface - RT_OFFSETOF(DRVBLOCK, IMediaAsyncPort))) )
 
-static DECLCALLBACK(int) drvblockAsyncTransferCompleteNotify(PPDMIMEDIAASYNCPORT pInterface, void *pvUser)
+static DECLCALLBACK(int) drvblockAsyncTransferCompleteNotify(PPDMIMEDIAASYNCPORT pInterface, void *pvUser, int rcReq)
 {
     PDRVBLOCK pThis = PDMIMEDIAASYNCPORT_2_DRVBLOCK(pInterface);
 
-    return pThis->pDrvBlockAsyncPort->pfnTransferCompleteNotify(pThis->pDrvBlockAsyncPort, pvUser);
+    return pThis->pDrvBlockAsyncPort->pfnTransferCompleteNotify(pThis->pDrvBlockAsyncPort, pvUser, rcReq);
 }
 

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

@@ -519 +519 @@
 #define PDMIMEDIAASYNCPORT_2_DRVDISKINTEGRITY(pInterface)    ( (PDRVDISKINTEGRITY((uintptr_t)pInterface - RT_OFFSETOF(DRVDISKINTEGRITY, IMediaAsyncPort))) )
 
-static DECLCALLBACK(int) drvdiskintAsyncTransferCompleteNotify(PPDMIMEDIAASYNCPORT pInterface, void *pvUser)
+static DECLCALLBACK(int) drvdiskintAsyncTransferCompleteNotify(PPDMIMEDIAASYNCPORT pInterface, void *pvUser, int rcReq)
 {
     PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNCPORT_2_DRVDISKINTEGRITY(pInterface);
@@ -527 +527 @@
     LogFlowFunc(("pIoReq=%#p\n", pIoReq));
 
-    if (pIoReq->fRead)
-        rc = drvdiskintReadVerify(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
-    else
-        rc = drvdiskintWriteRecord(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
-
-    AssertRC(rc);
-
-    rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort, pIoReq->pvUser);
+    if (RT_SUCCESS(rcReq))
+    {
+        if (pIoReq->fRead)
+            rc = drvdiskintReadVerify(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
+        else
+            rc = drvdiskintWriteRecord(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
+
+        AssertRC(rc);
+    }
+
+    rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort, pIoReq->pvUser, rcReq);
     RTMemFree(pIoReq);
 

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

@@ -191 +191 @@
 }
 
-static int drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser)
+static int drvscsiTransferCompleteNotify(PPDMIBLOCKASYNCPORT pInterface, void *pvUser, int rc)
 {
     PDRVSCSI pThis = PDMIBLOCKASYNCPORT_2_DRVSCSI(pInterface);
@@ -207 +207 @@
 
     ASMAtomicDecU32(&pThis->StatIoDepth);
-    VSCSIIoReqCompleted(hVScsiIoReq, VINF_SUCCESS);
+    VSCSIIoReqCompleted(hVScsiIoReq, rc);
 
     return VINF_SUCCESS;

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

@@ -304 +304 @@
 
         AssertPtr(pStorageBackend->pfnCompleted);
-        rc = pStorageBackend->pfnCompleted(pvUser);
+        rc = pStorageBackend->pfnCompleted(pvUser, rcReq);
         AssertRC(rc);
 
@@ -991 +991 @@
 *******************************************************************************/
 
-static void drvvdAsyncReqComplete(void *pvUser1, void *pvUser2)
+static void drvvdAsyncReqComplete(void *pvUser1, void *pvUser2, int rcReq)
 {
     PVBOXDISK pThis = (PVBOXDISK)pvUser1;
 
     int rc = pThis->pDrvMediaAsyncPort->pfnTransferCompleteNotify(pThis->pDrvMediaAsyncPort,
-                                                                  pvUser2);
+                                                                  pvUser2, rcReq);
     AssertRC(rc);
 }

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

@@ -1759 +1759 @@
 }
 
-static int vdIOReqCompleted(void *pvUser)
+static int vdIOReqCompleted(void *pvUser, int rcReq)
 {
     int rc = VINF_SUCCESS;
@@ -1816 +1816 @@
                 {
                     LogFlowFunc(("Parent I/O context completed pIoCtxParent=%#p\n", pIoCtx));
-                    pIoCtxParent->Type.Root.pfnComplete(pIoCtxParent->Type.Root.pvUser1, pIoCtxParent->Type.Root.pvUser2);
+                    pIoCtxParent->Type.Root.pfnComplete(pIoCtxParent->Type.Root.pvUser1,
+                                                        pIoCtxParent->Type.Root.pvUser2,
+                                                        pIoCtxParent->rcReq);
                     vdIoCtxFree(pDisk, pIoCtxParent);
                 }
@@ -1857 +1859 @@
                             LogFlowFunc(("Waiting I/O context completed pIoCtxWait=%#p\n", pIoCtxWait));
                             pIoCtxWait->Type.Root.pfnComplete(pIoCtxWait->Type.Root.pvUser1,
-                                                              pIoCtxWait->Type.Root.pvUser2);
+                                                              pIoCtxWait->Type.Root.pvUser2,
+                                                              pIoCtxWait->rcReq);
                             vdIoCtxFree(pDisk, pIoCtxWait);
                         }
@@ -1866 +1869 @@
             }
             else
-                pIoCtx->Type.Root.pfnComplete(pIoCtx->Type.Root.pvUser1, pIoCtx->Type.Root.pvUser2);
+                pIoCtx->Type.Root.pfnComplete(pIoCtx->Type.Root.pvUser1,
+                                              pIoCtx->Type.Root.pvUser2,
+                                              pIoCtx->rcReq);
 
             vdIoCtxFree(pDisk, pIoCtx);