Changeset 88812 in vbox

Timestamp:

May 1, 2021 6:11:36 PM (4 years ago)

Author:

vboxsync

Message:

NVMe,VBoxService: Corrected (soon to be) incorrect use of RTReqQueueCallV/RTReqQueueCallEx and RTREQFLAGS_NO_WAIT. bugref:9890

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlProcess.cpp

@@ -2064 +2064 @@
 
 static int vgsvcGstCtrlProcessRequestExV(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx, bool fAsync,
-                                         RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, va_list Args)
+                                         RTMSINTERVAL uTimeoutMS, PFNRT pfnFunction, unsigned cArgs, va_list Args)
 {
     RT_NOREF1(pHostCtx);
@@ -2087 +2087 @@
         }
 
-        rc = RTReqQueueCallV(pProcess->hReqQueue, &pReq, uTimeoutMS, fFlags, pfnFunction, cArgs, Args);
+        PRTREQ hReq = NIL_RTREQ;
+        rc = RTReqQueueCallV(pProcess->hReqQueue, &hReq, uTimeoutMS, fFlags, pfnFunction, cArgs, Args);
+        RTReqRelease(hReq);
         if (RT_SUCCESS(rc))
         {
@@ -2131 +2133 @@
     va_start(va, cArgs);
     int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, true /* fAsync */, 0 /* uTimeoutMS */,
-                                           NULL /* pReq */, pfnFunction, cArgs, va);
+                                           pfnFunction, cArgs, va);
     va_end(va);
 
@@ -2140 +2142 @@
 #if 0 /* unused */
 static int vgsvcGstCtrlProcessRequestWait(PVBOXSERVICECTRLPROCESS pProcess, const PVBGLR3GUESTCTRLCMDCTX pHostCtx,
-                                          RTMSINTERVAL uTimeoutMS, PRTREQ pReq, PFNRT pfnFunction, unsigned cArgs, ...)
+                                          RTMSINTERVAL uTimeoutMS, PFNRT pfnFunction, unsigned cArgs, ...)
 {
     AssertPtrReturn(pProcess, VERR_INVALID_POINTER);
@@ -2149 +2151 @@
     va_start(va, cArgs);
     int rc = vgsvcGstCtrlProcessRequestExV(pProcess, pHostCtx, false /* fAsync */, uTimeoutMS,
-                                           pReq, pfnFunction, cArgs, va);
+                                           pfnFunction, cArgs, va);
     va_end(va);