Changeset 80308 in vbox for trunk/src/VBox/Devices/VirtIO

Timestamp:

Aug 15, 2019 7:48:27 PM (5 years ago)

Author:

vboxsync

Message:

Storage/DevVirtioSCSI.cpp: Some cleanup of r132764

Location:

trunk/src/VBox/Devices/VirtIO

Files:

• Virtio_1_0.cpp (modified) (16 diffs)
• Virtio_1_0_impl.h (modified) (3 diffs)

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

@@ -105 +105 @@
 {
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    PVIRTQ_SHADOW_T pVirtqShadow = &(pVirtio->queueShadow[qIdx]);
+    PVIRTQ_SHADOW_T pVirtqShadow = &(pVirtio->virtqShadow[qIdx]);
     if (pVirtio->uQueueEnable[qIdx])
     {
@@ -120 +120 @@
 const char *virtioQueueGetName(VIRTIOHANDLE hVirtio, uint16_t qIdx)
 {
-    return (const char *)((PVIRTIOSTATE)hVirtio)->queueShadow[qIdx].pcszName;
+    return (const char *)((PVIRTIOSTATE)hVirtio)->virtqShadow[qIdx].pcszName;
 }
 
@@ -127 +127 @@
 {
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
 
     if (virtioQueueIsEmpty(pVirtio, qIdx))
@@ -141 +141 @@
 {
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    return vqReadAvailDescIdx(pVirtio, qIdx) == pVirtio->queueShadow->uAvailIdx;
+    return vqReadAvailDescIdx(pVirtio, qIdx) == pVirtio->virtqShadow->uAvailIdx;
 }
 
@@ -157 +157 @@
 
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
 
     if (!(pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK))
@@ -243 +243 @@
 {
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
 
     Log2Func(("%s: %s desc_idx=%u acb=%u\n",
@@ -289 +289 @@
 {
     PVIRTIOSTATE pVirtio = (PVIRTIOSTATE)hVirtio;
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
 
     uint16_t uDescIdx = vqReadUsedDescIdx(pVirtio, qIdx);
@@ -296 +296 @@
 
     vqWriteUsedRingDescIdx(pVirtio, qIdx, pVirtqShadow->uUsedIdx);
-    vqNotify(pVirtio, qIdx);
+    vqNotifyDriver(pVirtio, qIdx);
 }
 
@@ -302 +302 @@
  * This is called when MMIO handler detects guest write to a virtq's notification address
  */
-static void vqNotified(PVIRTIOSTATE pVirtio, uint16_t qIdx, uint16_t uNotifyIdx)
+static void vqDeviceNotified(PVIRTIOSTATE pVirtio, uint16_t qIdx, uint16_t uNotifyIdx)
 {
     Assert(uNotifyIdx == qIdx);
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
     Log2Func(("%s: %s notified\n", INSTANCE(pVirtio), pVirtqShadow->pcszName));
 
@@ -318 +318 @@
  * See VirtIO 1.0 specification (see section 2.4.7).
  */
-static void vqNotify(PVIRTIOSTATE pVirtio, uint16_t qIdx)
-{
-    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->queueShadow[qIdx];
+static void vqNotifyDriver(PVIRTIOSTATE pVirtio, uint16_t qIdx)
+{
+    PVIRTQ_SHADOW_T pVirtqShadow = &pVirtio->virtqShadow[qIdx];
 
     if (!(pVirtio->uDeviceStatus & VIRTIO_STATUS_DRIVER_OK))
@@ -417 +417 @@
 static void vqReset(PVIRTIOSTATE pVirtio, uint16_t qIdx)
 {
-    PVIRTQ_SHADOW_T pVirtQ = &pVirtio->queueShadow[qIdx];
+    PVIRTQ_SHADOW_T pVirtQ = &pVirtio->virtqShadow[qIdx];
     pVirtQ->uAvailIdx = 0;
     pVirtQ->uUsedIdx  = 0;
@@ -782 +782 @@
         uint16_t qIdx = uNotifyBaseOffset / VIRTIO_NOTIFY_OFFSET_MULTIPLIER;
         uint16_t uNotifiedIdx = *(uint16_t *)pv;
-        vqNotified(pVirtio, qIdx, uNotifiedIdx);
+        vqDeviceNotified(pVirtio, qIdx, uNotifiedIdx);
     }
     else
@@ -1259 +1259 @@
             {
                 Log2Func(("%s queue:\n",
-                          "  queueShadow[%u].uAvailIdx   = %u\n"
-                          "  queueShadow[%u].uUsedIdx    = %u\n"
+                          "  virtqShadow[%u].uAvailIdx   = %u\n"
+                          "  virtqShadow[%u].uUsedIdx    = %u\n"
                           "  uQueueSize[%u]              = %u\n"
                           "  uQueueNotifyOff[%u]         = %04x\n"
@@ -1268 +1268 @@
                           "  pGcPhysQueueAvail[%u]       = %RGp\n"
                           "  pGcPhysQueueUsed[%u]        = %RGp\n",
-                                i, pVirtio->queueShadow[i].pcszName,
-                                i, pVirtio->queueShadow[i].uAvailIdx,
-                                i, pVirtio->queueShadow[i].uUsedIdx,
+                                i, pVirtio->virtqShadow[i].pcszName,
+                                i, pVirtio->virtqShadow[i].uAvailIdx,
+                                i, pVirtio->virtqShadow[i].uUsedIdx,
                                 i, pVirtio->uQueueSize[i],
                                 i, pVirtio->uQueueNotifyOff[i],
@@ -1332 +1332 @@
         rc = SSMR3PutU16(pSSM,      pVirtio->uQueueEnable[i]);
         rc = SSMR3PutU16(pSSM,      pVirtio->uQueueSize[i]);
-        rc = SSMR3PutU16(pSSM,      pVirtio->queueShadow[i].uAvailIdx);
-        rc = SSMR3PutU16(pSSM,      pVirtio->queueShadow[i].uUsedIdx);
-        rc = SSMR3PutMem(pSSM,      pVirtio->queueShadow[i].pcszName, 32);
+        rc = SSMR3PutU16(pSSM,      pVirtio->virtqShadow[i].uAvailIdx);
+        rc = SSMR3PutU16(pSSM,      pVirtio->virtqShadow[i].uUsedIdx);
+        rc = SSMR3PutMem(pSSM,      pVirtio->virtqShadow[i].pcszName, 32);
     }
 
@@ -1391 +1391 @@
             rc = SSMR3GetU16(pSSM,      &pVirtio->uQueueEnable[i]);
             rc = SSMR3GetU16(pSSM,      &pVirtio->uQueueSize[i]);
-            rc = SSMR3GetU16(pSSM,      &pVirtio->queueShadow[i].uAvailIdx);
-            rc = SSMR3GetU16(pSSM,      &pVirtio->queueShadow[i].uUsedIdx);
-            rc = SSMR3GetMem(pSSM,      pVirtio->queueShadow[i].pcszName, 32);
+            rc = SSMR3GetU16(pSSM,      &pVirtio->virtqShadow[i].uAvailIdx);
+            rc = SSMR3GetU16(pSSM,      &pVirtio->virtqShadow[i].uUsedIdx);
+            rc = SSMR3GetMem(pSSM,      pVirtio->virtqShadow[i].pcszName, 32);
         }
     }

trunk/src/VBox/Devices/VirtIO/Virtio_1_0_impl.h

@@ -177 +177 @@
     uint8_t                   uConfigGeneration;                 /**< (MMIO) Device config sequencer       HOST */
 
-    VIRTQ_SHADOW_T            queueShadow[VIRTQ_MAX_CNT];       /**< Local impl-specific queue context         */
+    VIRTQ_SHADOW_T            virtqShadow[VIRTQ_MAX_CNT];        /**< Local impl-specific queue context         */
     VIRTIOCALLBACKS           virtioCallbacks;                   /**< Callback vectors to client                */
 
@@ -356 +356 @@
 DECLINLINE(bool) vqIsEmpty(PVIRTIOSTATE pVirtio, uint16_t qIdx)
 {
-    return vqReadAvailDescIdx(pVirtio, qIdx) == pVirtio->queueShadow->uAvailIdx;
+    return vqReadAvailDescIdx(pVirtio, qIdx) == pVirtio->virtqShadow->uAvailIdx;
 }
 
@@ -511 +511 @@
 }
 
-       void vqNotified              (PVIRTIOSTATE pVirtio, uint32_t qidx, uint16_t uDescIdx);
-static void vqNotify                (PVIRTIOSTATE pVirtio, uint16_t qIdx);
 static void vqReset                 (PVIRTIOSTATE pVirtio, uint16_t qIdx);
+static void vqDeviceNotified        (PVIRTIOSTATE pVirtio, uint16_t qidx, uint16_t uDescIdx);
+static void vqNotifyDriver          (PVIRTIOSTATE pVirtio, uint16_t qIdx);
 static int  virtioRaiseInterrupt    (PVIRTIOSTATE pVirtio, uint8_t uCause);
 static void virtioLowerInterrupt    (PVIRTIOSTATE pVirtio);