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

Timestamp:

Jul 5, 2023 7:47:33 AM (22 months ago)

Author:

vboxsync

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

158108

Message:

Devices/VirtIO,DevVirtioNet,DevVirtioSCSI: Get rid of VIRTIO_VBUF_ON_STACK which is the default for quite some time now to make the code more straight forward, bugref:10459

File:

• trunk/src/VBox/Devices/Storage/DevVirtioSCSI.cpp (modified) (4 diffs)

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

@@ -1648 +1648 @@
              for (int i = 0; i < pWorkerR3->cRedoDescs; i++)
              {
-#ifdef VIRTIO_VBUF_ON_STACK
                 PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
                 if (!pVirtqBuf)
@@ -1657 +1656 @@
                 int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr,
                                                     pWorkerR3->auRedoDescs[i], pVirtqBuf);
-#else /* !VIRTIO_VBUF_ON_STACK */
-                  PVIRTQBUF pVirtqBuf;
-                  int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr,
-                                                        pWorkerR3->auRedoDescs[i], &pVirtqBuf);
-#endif /* !VIRTIO_VBUF_ON_STACK */
-                  if (RT_FAILURE(rc))
-                      LogRel(("Error fetching desc chain to redo, %Rrc", rc));
-
-                  rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
-                  if (RT_FAILURE(rc))
-                      LogRel(("Error submitting req packet, resetting %Rrc", rc));
+                if (RT_FAILURE(rc))
+                    LogRel(("Error fetching desc chain to redo, %Rrc", rc));
+
+                rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
+                if (RT_FAILURE(rc))
+                    LogRel(("Error submitting req packet, resetting %Rrc", rc));
 
                   virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
@@ -1674 +1668 @@
 
              Log6Func(("fetching next descriptor chain from %s\n", VIRTQNAME(uVirtqNbr)));
-#ifdef VIRTIO_VBUF_ON_STACK
             PVIRTQBUF pVirtqBuf = virtioCoreR3VirtqBufAlloc();
             if (!pVirtqBuf)
@@ -1680 +1673 @@
             else
             {
-             int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr, pVirtqBuf, true);
-#else /* !VIRTIO_VBUF_ON_STACK */
-             PVIRTQBUF pVirtqBuf = NULL;
-             int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr, &pVirtqBuf, true);
-#endif /* !VIRTIO_VBUF_ON_STACK */
-             if (rc == VERR_NOT_AVAILABLE)
-             {
-                 Log6Func(("Nothing found in %s\n", VIRTQNAME(uVirtqNbr)));
-                 virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
-                 continue;
-             }
-
-             AssertRC(rc);
-             if (uVirtqNbr == CONTROLQ_IDX)
-                 virtioScsiR3Ctrl(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
-             else /* request queue index */
-             {
-                 rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
-                 if (RT_FAILURE(rc))
-                     LogRel(("Error submitting req packet, resetting %Rrc", rc));
-             }
-
-             virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
-#ifdef VIRTIO_VBUF_ON_STACK
+                int rc = virtioCoreR3VirtqAvailBufGet(pDevIns, &pThis->Virtio, uVirtqNbr, pVirtqBuf, true);
+                if (rc == VERR_NOT_AVAILABLE)
+                {
+                    Log6Func(("Nothing found in %s\n", VIRTQNAME(uVirtqNbr)));
+                    virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
+                    continue;
+                }
+
+                AssertRC(rc);
+                if (uVirtqNbr == CONTROLQ_IDX)
+                    virtioScsiR3Ctrl(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
+                else /* request queue index */
+                {
+                    rc = virtioScsiR3ReqSubmit(pDevIns, pThis, pThisCC, uVirtqNbr, pVirtqBuf);
+                    if (RT_FAILURE(rc))
+                        LogRel(("Error submitting req packet, resetting %Rrc", rc));
+                }
+
+                virtioCoreR3VirtqBufRelease(&pThis->Virtio, pVirtqBuf);
             }
-#endif /* VIRTIO_VBUF_ON_STACK */
         }
     }