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

Timestamp:

Feb 24, 2014 10:43:23 PM (11 years ago)

Author:

vboxsync

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

92428

Message:

AHCI: Make sure the async notification handler is called from the async I/O worker thread too when a request completes, minor cleanup (ahciTransferComplete doesn't return a status code but a boolean)

File:

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

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

@@ -6051 +6051 @@
     }
 
+    if (pAhciPort->cTasksActive == 0 && pAhciPort->pAhciR3->fSignalIdle)
+        PDMDevHlpAsyncNotificationCompleted(pAhciPort->pDevInsR3);
+
     return fCanceled;
 }
@@ -6070 +6073 @@
              __FUNCTION__, pInterface, pvUser, pAhciReq->uTag));
 
-    int rc = ahciTransferComplete(pAhciPort, pAhciReq, rcReq, true);
-
-    if (pAhciPort->cTasksActive == 0 && pAhciPort->pAhciR3->fSignalIdle)
-        PDMDevHlpAsyncNotificationCompleted(pAhciPort->pDevInsR3);
-    return rc;
+    ahciTransferComplete(pAhciPort, pAhciReq, rcReq, true);
+
+    return VINF_SUCCESS;
 }
 
@@ -6539 +6540 @@
         while (idx)
         {
+            bool fReqCanceled = false;
             AHCITXDIR enmTxDir;
             PAHCIREQ pAhciReq;
@@ -6675 +6677 @@
                             }
                             if (rc == VINF_VD_ASYNC_IO_FINISHED)
-                                rc = ahciTransferComplete(pAhciPort, pAhciReq, VINF_SUCCESS, true);
+                                fReqCanceled = ahciTransferComplete(pAhciPort, pAhciReq, VINF_SUCCESS, true);
                             else if (RT_FAILURE(rc) && rc != VERR_VD_ASYNC_IO_IN_PROGRESS)
-                                rc = ahciTransferComplete(pAhciPort, pAhciReq, rc, true);
+                                fReqCanceled = ahciTransferComplete(pAhciPort, pAhciReq, rc, true);
                         }
                         else
@@ -6710 +6712 @@
                                 pAhciPort->Led.Asserted.s.fWriting = pAhciPort->Led.Actual.s.fWriting = 0;
                             }
-                            rc = ahciTransferComplete(pAhciPort, pAhciReq, rc, true);
+                            fReqCanceled = ahciTransferComplete(pAhciPort, pAhciReq, rc, true);
                         }
                     }
                 }
                 else
-                    rc = ahciTransferComplete(pAhciPort, pAhciReq, VINF_SUCCESS, true);
+                    fReqCanceled = ahciTransferComplete(pAhciPort, pAhciReq, VINF_SUCCESS, true);
             } /* Command */
+
+            /*
+             * Don't process other requests if the last one was canceled,
+             * the others are not valid anymore.
+             */
+            if (fReqCanceled)
+                break;
 
             u32Tasks &= ~RT_BIT_32(idx); /* Clear task bit. */