Changeset 64825 in vbox for trunk

Timestamp:

Dec 9, 2016 8:32:53 PM (8 years ago)

Author:

vboxsync

Message:

Devices/Virtio: vqueuePut - refactor more or less mechanically and
reformat to improve overall readability.

File:

• trunk/src/VBox/Devices/VirtIO/Virtio.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -219 +219 @@
 }
 
-void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue, PVQUEUEELEM pElem, uint32_t uLen, uint32_t uReserved)
-{
-    unsigned int i, uOffset, cbReserved = uReserved;
-
-    Log2(("%s vqueuePut: %s desc_idx=%u acb=%u\n", INSTANCE(pState),
-          QUEUENAME(pState, pQueue), pElem->uIndex, uLen));
-    for (i = uOffset = 0; i < pElem->nIn && uOffset < uLen - uReserved; i++)
-    {
-        uint32_t cbSegLen = RT_MIN(uLen - uReserved - uOffset, pElem->aSegsIn[i].cb - cbReserved);
-        if (pElem->aSegsIn[i].pv)
+
+void vqueuePut(PVPCISTATE pState, PVQUEUE pQueue,
+               PVQUEUEELEM pElem, uint32_t uTotalLen, uint32_t uReserved)
+{
+    Log2(("%s vqueuePut: %s"
+          " desc_idx=%u acb=%u (%u)\n",
+          INSTANCE(pState), QUEUENAME(pState, pQueue),
+          pElem->uIndex, uTotalLen, uReserved));
+
+    Assert(uReserved < uTotalLen);
+
+    uint32_t cbLen = uTotalLen - uReserved;
+    uint32_t cbSkip = uReserved;
+
+    for (unsigned i = 0; i < pElem->nIn && cbLen > 0; ++i)
+    {
+        if (cbSkip >= pElem->aSegsIn[i].cb) /* segment completely skipped? */
         {
-            if (cbSegLen > 0)
-            {
-                Log2(("%s vqueuePut: %s used_idx=%u seg=%u addr=%p pv=%p cb=%u acb=%u\n", INSTANCE(pState),
-                      QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, i, pElem->aSegsIn[i].addr, pElem->aSegsIn[i].pv, pElem->aSegsIn[i].cb, cbSegLen));
-                PDMDevHlpPCIPhysWrite(pState->CTX_SUFF(pDevIns), pElem->aSegsIn[i].addr + cbReserved,
-                                      pElem->aSegsIn[i].pv, cbSegLen);
-            }
-            cbReserved = 0;
+            cbSkip -= pElem->aSegsIn[i].cb;
+            continue;
         }
-        uOffset += cbSegLen;
-    }
-
-    Assert((uReserved + uOffset) == uLen || pElem->nIn == 0);
-    Log2(("%s vqueuePut: %s used_idx=%u guest_used_idx=%u id=%u len=%u\n", INSTANCE(pState),
-          QUEUENAME(pState, pQueue), pQueue->uNextUsedIndex, vringReadUsedIndex(pState, &pQueue->VRing), pElem->uIndex, uLen));
-    vringWriteUsedElem(pState, &pQueue->VRing, pQueue->uNextUsedIndex++, pElem->uIndex, uLen);
-}
+
+        uint32_t cbSegLen = pElem->aSegsIn[i].cb - cbSkip;
+        if (cbSegLen > cbLen)   /* last segment only partially used? */
+            cbSegLen = cbLen;
+
+        /*
+         * XXX: We should assert pv != NULL, but we need to check and
+         * fix all callers first.
+         */
+        if (pElem->aSegsIn[i].pv != NULL)
+        {
+            Log2(("%s vqueuePut: %s"
+                  " used_idx=%u seg=%u addr=%p pv=%p cb=%u acb=%u\n",
+                  INSTANCE(pState), QUEUENAME(pState, pQueue),
+                  pQueue->uNextUsedIndex, i,
+                  (void *)pElem->aSegsIn[i].addr, pElem->aSegsIn[i].pv,
+                  pElem->aSegsIn[i].cb, cbSegLen));
+
+            PDMDevHlpPCIPhysWrite(pState->CTX_SUFF(pDevIns),
+                                  pElem->aSegsIn[i].addr + cbSkip,
+                                  pElem->aSegsIn[i].pv,
+                                  cbSegLen);
+        }
+
+        cbSkip = 0;
+        cbLen -= cbSegLen;
+    }
+
+    Log2(("%s vqueuePut: %s"
+          " used_idx=%u guest_used_idx=%u id=%u len=%u\n",
+          INSTANCE(pState), QUEUENAME(pState, pQueue),
+          pQueue->uNextUsedIndex, vringReadUsedIndex(pState, &pQueue->VRing),
+          pElem->uIndex, uTotalLen));
+
+    vringWriteUsedElem(pState, &pQueue->VRing,
+                       pQueue->uNextUsedIndex++,
+                       pElem->uIndex, uTotalLen);
+}
+
 
 void vqueueNotify(PVPCISTATE pState, PVQUEUE pQueue)