Changeset 104556 in vbox

Timestamp:

May 8, 2024 1:32:45 PM (9 months ago)

Author:

vboxsync

Message:

src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp: Simplify pdmacFileAioMgrNormalReqsEnqueue() a bit as it would only ever return VINF_SUCCESS and therefore can be converted to return nothing, bugref:3409

File:

• trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp

@@ -557 +557 @@
  * Wrapper around RTFIleAioCtxSubmit() which is also doing error handling.
  */
-static int pdmacFileAioMgrNormalReqsEnqueue(PPDMACEPFILEMGR pAioMgr,
-                                            PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
-                                            PRTFILEAIOREQ pahReqs, unsigned cReqs)
+static void pdmacFileAioMgrNormalReqsEnqueue(PPDMACEPFILEMGR pAioMgr,
+                                             PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
+                                             PRTFILEAIOREQ pahReqs, unsigned cReqs)
 {
     pAioMgr->cRequestsActive += cReqs;
@@ -621 +621 @@
                 {
                     /* We call ourself again to do any error handling which might come up now. */
-                    rc = pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &pahReqs[i], 1);
-                    AssertRC(rc);
+                    pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &pahReqs[i], 1);
                 }
                 else if (rcReq != VERR_FILE_AIO_IN_PROGRESS)
@@ -646 +645 @@
         }
     }
-
-    return VINF_SUCCESS;
 }
 
@@ -1099 +1096 @@
         if (cRequests == RT_ELEMENTS(apReqs))
         {
-            rc = pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, apReqs, cRequests);
+            pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, apReqs, cRequests);
             cRequests = 0;
-            AssertMsg(RT_SUCCESS(rc) || (rc == VERR_FILE_AIO_INSUFFICIENT_RESSOURCES),
-                      ("Unexpected return code\n"));
         }
     }
 
     if (cRequests)
-    {
-        rc = pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, apReqs, cRequests);
-        AssertMsg(RT_SUCCESS(rc) || (rc == VERR_FILE_AIO_INSUFFICIENT_RESSOURCES),
-                  ("Unexpected return code rc=%Rrc\n", rc));
-    }
+        pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, apReqs, cRequests);
 
     if (pTaskHead)
@@ -1521 +1512 @@
 
                 pTask->hReq = hReq;
-                rc = pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &hReq, 1);
-                AssertMsg(RT_SUCCESS(rc) || (rc == VERR_FILE_AIO_INSUFFICIENT_RESSOURCES),
-                          ("Unexpected return code rc=%Rrc\n", rc));
+                pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &hReq, 1);
             }
             else if (pTask->fPrefetch)
@@ -1552 +1541 @@
                 AssertRC(rc);
                 pTask->hReq = hReq;
-                rc = pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &hReq, 1);
-                AssertMsg(RT_SUCCESS(rc) || (rc == VERR_FILE_AIO_INSUFFICIENT_RESSOURCES),
-                          ("Unexpected return code rc=%Rrc\n", rc));
+                pdmacFileAioMgrNormalReqsEnqueue(pAioMgr, pEndpoint, &hReq, 1);
             }
             else