Changeset 105353 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Jul 16, 2024 11:47:19 AM (7 months ago)

Author:

vboxsync

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

164006

Message:

iprt/req.h,*: Adjustments of the RTReqQueue API to fit darwin/arm64 restrictions. bugref:10725

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvCloudTunnel.cpp (modified) (3 diffs)
• DrvNAT.cpp (modified) (5 diffs)
• DrvNATlibslirp.cpp (modified) (1 diff)
• slirp/hostres.c (modified) (3 diffs)
• slirp/libslirp.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DrvCloudTunnel.cpp

@@ -419 +419 @@
         Log2(("%s: submitting TX request (pvSeg=%p, %u bytes) to I/O queue...\n",
               pThis->pszInstance, pSgBuf->aSegs[0].pvSeg, pSgBuf->cbUsed));
-        rc = RTReqQueueCallEx(pThis->hIoReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+        rc = RTReqQueueCallEx(pThis->hIoReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                               (PFNRT)drvCloudTunnelSendWorker, 2, pThis, pSgBuf);
 
@@ -743 +742 @@
         return len;
     }
-    int rc = RTReqQueueCallEx(pThis->hDevReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+    int rc = RTReqQueueCallEx(pThis->hDevReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                               (PFNRT)drvCloudTunnelReceiveWorker, 3, pThis, pvPacket, len);
     if (RT_FAILURE(rc))
@@ -821 +819 @@
     /* Wake up device thread. */
     PRTREQ pReq;
-    int rc = RTReqQueueCall(pThis->hDevReqQueue, &pReq, 10000 /*cMillies*/,
-                            (PFNRT)drvCloudTunnelReceiveWakeup, 1, pThis);
+    int rc = RTReqQueueCall(pThis->hDevReqQueue, &pReq, 10000 /*cMillies*/, (PFNRT)drvCloudTunnelReceiveWakeup, 1, pThis);
     if (RT_FAILURE(rc))
         LogRel(("%s: failed to wake up device thread - %Rrc\n", pThis->pszInstance, rc));

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -610 +610 @@
     if (pThis->pSlirpThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+        rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                               (PFNRT)drvNATSendWorker, 2, pThis, pSgBuf);
         if (RT_SUCCESS(rc))
@@ -963 +962 @@
 
     int rc;
-    rc = RTReqQueueCallEx(pThis->hHostResQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                          RTREQFLAGS_IPRT_STATUS | RTREQFLAGS_NO_WAIT,
+    rc = RTReqQueueCallEx(pThis->hHostResQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_IPRT_STATUS | RTREQFLAGS_NO_WAIT,
                           (PFNRT)drvNATReqQueueInterrupt, 0);
     return rc;
@@ -1046 +1044 @@
  * Call a function on the slirp thread.
  */
-int slirp_call(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies,
-               unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
+int slirp_call(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies, unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...)
 {
     PDRVNAT pThis = (PDRVNAT)pvUser;
@@ -1085 +1082 @@
     va_start(va, cArgs);
 
-    rc = RTReqQueueCallV(pThis->hHostResQueue, ppReq, cMillies, fFlags,
-                         pfnFunction, cArgs, va);
+    rc = RTReqQueueCallV(pThis->hHostResQueue, ppReq, cMillies, fFlags, pfnFunction, cArgs, va);
 
     va_end(va);
@@ -1291 +1287 @@
              * so we schedule the worker and kick the NAT thread.
              */
-            int rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                                      RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+            int rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                                       (PFNRT)drvNATReinitializeHostNameResolving, 1, pThis);
             if (RT_SUCCESS(rc))

trunk/src/VBox/Devices/Network/DrvNATlibslirp.cpp

@@ -334 +334 @@
     if (pThis->pSlirpThread->enmState == PDMTHREADSTATE_RUNNING)
     {
-        rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/,
-                              RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
+        rc = RTReqQueueCallEx(pThis->hSlirpReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                               (PFNRT)drvNATSendWorker, 2, pThis, pSgBuf);
         if (RT_SUCCESS(rc))

trunk/src/VBox/Devices/Network/slirp/hostres.c

@@ -175 +175 @@
 
 
-static void hostres_async(struct response *res);
-static void hostres_slirp_reply(struct response *res);
+static DECLCALLBACK(void) hostres_async(struct response *res);
+static DECLCALLBACK(void) hostres_slirp_reply(struct response *res);
 
 
@@ -205 +205 @@
     res->end = res->qlen = mlen;
 
-    rc = slirp_call_hostres(pData->pvUser, NULL, 0,
-                            RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                            (PFNRT)hostres_async, 1, res);
-
+    rc = slirp_call_hostres(pData->pvUser, NULL, 0, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT, (PFNRT)hostres_async, 1, res);
     if (RT_FAILURE(rc))
     {
@@ -341 +338 @@
     free_labels(res->labels);
 
-    rc = slirp_call(res->pData->pvUser, NULL, 0,
-                    RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
-                    (PFNRT)hostres_slirp_reply, 1, res);
-
+    rc = slirp_call(res->pData->pvUser, NULL, 0, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT, (PFNRT)hostres_slirp_reply, 1, res);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Network/slirp/libslirp.h

@@ -84 +84 @@
 
 int slirp_call(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies,
-               unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...);
+               unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(5, 6, 7);
 
 int slirp_call_hostres(void *pvUser, PRTREQ *ppReq, RTMSINTERVAL cMillies,
-                       unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...);
+                       unsigned fFlags, PFNRT pfnFunction, unsigned cArgs, ...) RT_IPRT_CALL_ATTR(5, 6, 7);