Changeset 81731 in vbox for trunk/src/VBox

Timestamp:

Nov 6, 2019 9:35:07 PM (5 years ago)

Author:

vboxsync

Message:

DevRirtioNet,Virtio: nits. bugref:9218

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet.cpp (modified) (10 diffs)
• VirtIO/Virtio.cpp (modified) (7 diffs)
• VirtIO/Virtio.h (modified) (11 diffs)

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

@@ -938 +938 @@
         }
 
-        if (elem.nIn < 1)
+        if (elem.cIn < 1)
         {
             Log(("%s vnetR3HandleRxPacket: No writable descriptors in receive queue!\n", INSTANCE(pThis)));
@@ -963 +963 @@
             uElemSize += cbHdr;
         }
-        while (nSeg < elem.nIn && uOffset < cb)
+        while (nSeg < elem.cIn && uOffset < cb)
         {
             unsigned int uSize = (unsigned int)RT_MIN(elem.aSegsIn[nSeg].cb - (nSeg?0:cbReserved),
@@ -1373 +1373 @@
     {
         unsigned int uOffset = 0;
-        if (elem.nOut < 2 || elem.aSegsOut[0].cb != cbHdr)
+        if (elem.cOut < 2 || elem.aSegsOut[0].cb != cbHdr)
         {
             Log(("%s vnetR3QueueTransmit: The first segment is not the header! (%u < 2 || %u != %u).\n",
-                 INSTANCE(pThis), elem.nOut, elem.aSegsOut[0].cb, cbHdr));
+                 INSTANCE(pThis), elem.cOut, elem.aSegsOut[0].cb, cbHdr));
             break; /* For now we simply ignore the header, but it must be there anyway! */
         }
@@ -1386 +1386 @@
 
         /* Compute total frame size. */
-        for (unsigned int i = 1; i < elem.nOut && uSize < VNET_MAX_FRAME_SIZE; i++)
+        for (unsigned int i = 1; i < elem.cOut && uSize < VNET_MAX_FRAME_SIZE; i++)
             uSize += elem.aSegsOut[i].cb;
         Log5(("%s vnetR3TransmitPendingPackets: complete frame is %u bytes.\n", INSTANCE(pThis), uSize));
@@ -1412 +1412 @@
 
                 /* Assemble a complete frame. */
-                for (unsigned int i = 1; i < elem.nOut && uSize > 0; i++)
+                for (unsigned int i = 1; i < elem.cOut && uSize > 0; i++)
                 {
                     unsigned int cbSegment = RT_MIN(uSize, elem.aSegsOut[i].cb);
@@ -1662 +1662 @@
 
     if (   pCtlHdr->u8Command != VNET_CTRL_CMD_MAC_TABLE_SET
-        || pElem->nOut != 3
+        || pElem->cOut != 3
         || pElem->aSegsOut[1].cb < sizeof(nMacs)
         || pElem->aSegsOut[2].cb < sizeof(nMacs))
     {
         Log(("%s vnetR3ControlMac: Segment layout is wrong (u8Command=%u nOut=%u cb1=%u cb2=%u)\n",
-             INSTANCE(pThis), pCtlHdr->u8Command, pElem->nOut, pElem->aSegsOut[1].cb, pElem->aSegsOut[2].cb));
+             INSTANCE(pThis), pCtlHdr->u8Command, pElem->cOut, pElem->aSegsOut[1].cb, pElem->aSegsOut[2].cb));
         return VNET_ERROR;
     }
@@ -1737 +1737 @@
     uint16_t u16Vid;
 
-    if (pElem->nOut != 2 || pElem->aSegsOut[1].cb != sizeof(u16Vid))
+    if (pElem->cOut != 2 || pElem->aSegsOut[1].cb != sizeof(u16Vid))
     {
         Log(("%s vnetR3ControlVlan: Segment layout is wrong (u8Command=%u nOut=%u cb=%u)\n",
-             INSTANCE(pThis), pCtlHdr->u8Command, pElem->nOut, pElem->aSegsOut[1].cb));
+             INSTANCE(pThis), pCtlHdr->u8Command, pElem->cOut, pElem->aSegsOut[1].cb));
         return VNET_ERROR;
     }
@@ -1781 +1781 @@
     while (vqueueGet(pDevIns, &pThis->VPCI, pQueue, &elem))
     {
-        if (elem.nOut < 1 || elem.aSegsOut[0].cb < sizeof(VNETCTLHDR))
+        if (elem.cOut < 1 || elem.aSegsOut[0].cb < sizeof(VNETCTLHDR))
         {
             Log(("%s vnetR3QueueControl: The first 'out' segment is not the header! (%u < 1 || %u < %u).\n",
-                 INSTANCE(pThis), elem.nOut, elem.aSegsOut[0].cb,sizeof(VNETCTLHDR)));
+                 INSTANCE(pThis), elem.cOut, elem.aSegsOut[0].cb,sizeof(VNETCTLHDR)));
             break; /* Skip the element and hope the next one is good. */
         }
-        if (   elem.nIn < 1
-            || elem.aSegsIn[elem.nIn - 1].cb < sizeof(VNETCTLACK))
+        if (   elem.cIn < 1
+            || elem.aSegsIn[elem.cIn - 1].cb < sizeof(VNETCTLACK))
         {
             Log(("%s vnetR3QueueControl: The last 'in' segment is too small to hold the acknowledge! (%u < 1 || %u < %u).\n",
-                 INSTANCE(pThis), elem.nIn, elem.aSegsIn[elem.nIn - 1].cb, sizeof(VNETCTLACK)));
+                 INSTANCE(pThis), elem.cIn, elem.aSegsIn[elem.cIn - 1].cb, sizeof(VNETCTLACK)));
             break; /* Skip the element and hope the next one is good. */
         }
@@ -1813 +1813 @@
         }
         Log(("%s Processed control message %u, ack=%u.\n", INSTANCE(pThis), CtlHdr.u8Class, bAck));
-        PDMDevHlpPCIPhysWrite(pDevIns, elem.aSegsIn[elem.nIn - 1].addr, &bAck, sizeof(bAck));
+        PDMDevHlpPCIPhysWrite(pDevIns, elem.aSegsIn[elem.cIn - 1].addr, &bAck, sizeof(bAck));
 
         vqueuePut(pDevIns, &pThis->VPCI, pQueue, &elem, sizeof(bAck));
@@ -1829 +1829 @@
     PVNETSTATE pThis = PDMDEVINS_2_DATA(pDevIns, PVNETSTATE);
     RT_NOREF(cArgs, papszArgs);
-    vpcR3iDumpStateWorker(&pThis->VPCI, pHlp);
+    vpciR3DumpStateWorker(&pThis->VPCI, pHlp);
 }
 

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

@@ -113 +113 @@
         return false;
 
-    pElem->nIn = pElem->nOut = 0;
+    pElem->cIn = pElem->cOut = 0;
 
     Log2(("%s vqueueGet: %s avail_idx=%u\n", INSTANCE(pThis), pQueue->szName, pQueue->uNextAvailIndex));
@@ -132 +132 @@
          * total number of descriptors in the ring (see @bugref{8620}).
          */
-        if (pElem->nIn + pElem->nOut >= VRING_MAX_SIZE)
+        if (pElem->cIn + pElem->cOut >= VRING_MAX_SIZE)
         {
             static volatile uint32_t s_cMessages  = 0;
@@ -153 +153 @@
         {
             Log2(("%s vqueueGet: %s IN  seg=%u desc_idx=%u addr=%p cb=%u\n", INSTANCE(pThis),
-                  pQueue->szName, pElem->nIn, idx, desc.u64Addr, desc.uLen));
-            pSeg = &pElem->aSegsIn[pElem->nIn++];
+                  pQueue->szName, pElem->cIn, idx, desc.u64Addr, desc.uLen));
+            pSeg = &pElem->aSegsIn[pElem->cIn++];
         }
         else
         {
             Log2(("%s vqueueGet: %s OUT seg=%u desc_idx=%u addr=%p cb=%u\n", INSTANCE(pThis),
-                  pQueue->szName, pElem->nOut, idx, desc.u64Addr, desc.uLen));
-            pSeg = &pElem->aSegsOut[pElem->nOut++];
+                  pQueue->szName, pElem->cOut, idx, desc.u64Addr, desc.uLen));
+            pSeg = &pElem->aSegsOut[pElem->cOut++];
         }
 
@@ -171 +171 @@
 
     Log2(("%s vqueueGet: %s head_desc_idx=%u nIn=%u nOut=%u\n", INSTANCE(pThis),
-          pQueue->szName, pElem->uIndex, pElem->nIn, pElem->nOut));
+          pQueue->szName, pElem->uIndex, pElem->cIn, pElem->cOut));
     return true;
 }
@@ -212 +212 @@
     uint32_t cbSkip = uReserved;
 
-    for (unsigned i = 0; i < pElem->nIn && cbLen > 0; ++i)
+    for (unsigned i = 0; i < pElem->cIn && cbLen > 0; ++i)
     {
         if (cbSkip >= pElem->aSegsIn[i].cb) /* segment completely skipped? */
@@ -659 +659 @@
  * Dumps the state (useful for both logging and info items).
  */
-void vpcR3iDumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp)
+void vpciR3DumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp)
 {
 
@@ -698 +698 @@
     {
         Log2(("vpciR3DumpState: (called from %s)\n", pcszCaller));
-        vpcR3iDumpStateWorker(pThis, DBGFR3InfoLogHlp());
+        vpciR3DumpStateWorker(pThis, DBGFR3InfoLogHlp());
     }
 }

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

@@ -53 +53 @@
 #define DEVICE_PCI_BASE_ID                  0x1000
 #define DEVICE_PCI_SUBSYSTEM_VENDOR_ID      0x1AF4
-#define DEVICE_PCI_SUBSYSTEM_BASE_ID       1
+#define DEVICE_PCI_SUBSYSTEM_BASE_ID        1
 
 #define VIRTIO_MAX_NQUEUES                  3
@@ -75 +75 @@
 #define VPCI_STATUS_FAILED                  0x80
 
-#define VPCI_F_NOTIFY_ON_EMPTY              0x01000000
-#define VPCI_F_ANY_LAYOUT                   0x08000000
-#define VPCI_F_RING_INDIRECT_DESC           0x10000000
-#define VPCI_F_RING_EVENT_IDX               0x20000000
-#define VPCI_F_BAD_FEATURE                  0x40000000
+#define VPCI_F_NOTIFY_ON_EMPTY              UINT32_C(0x01000000)
+#define VPCI_F_ANY_LAYOUT                   UINT32_C(0x08000000)
+#define VPCI_F_RING_INDIRECT_DESC           UINT32_C(0x10000000)
+#define VPCI_F_RING_EVENT_IDX               UINT32_C(0x20000000)
+#define VPCI_F_BAD_FEATURE                  UINT32_C(0x40000000)
 
 #define VRINGDESC_MAX_SIZE                  (2 * 1024 * 1024)
@@ -86 +86 @@
 #define VRINGDESC_F_INDIRECT                0x04
 
-typedef struct VRingDesc
+typedef struct VRINGDESC
 {
     uint64_t u64Addr;
@@ -95 +95 @@
 typedef VRINGDESC *PVRINGDESC;
 
-#define VRINGAVAIL_F_NO_INTERRUPT 0x01
-
-typedef struct VRingAvail
+#define VRINGAVAIL_F_NO_INTERRUPT           0x01
+
+typedef struct VRINGAVAIL
 {
     uint16_t uFlags;
@@ -104 +104 @@
 } VRINGAVAIL;
 
-typedef struct VRingUsedElem
+typedef struct VRINGUSEDELEM
 {
     uint32_t uId;
@@ -120 +120 @@
 typedef VRINGUSED *PVRINGUSED;
 
-#define VRING_MAX_SIZE 1024
-
-typedef struct VRing
+#define VRING_MAX_SIZE                      1024
+
+typedef struct VRING
 {
     uint16_t   uSize;
@@ -158 +158 @@
 typedef VQUEUER3 *PVQUEUER3;
 
-typedef struct VQueueElemSeg
+typedef struct VQUEUESEG
 {
     RTGCPHYS addr;
@@ -165 +165 @@
 } VQUEUESEG;
 
-typedef struct VQueueElem
+typedef struct VQUEUEELEM
 {
     uint32_t  uIndex;
-    uint32_t  nIn;
-    uint32_t  nOut;
+    uint32_t  cIn;
+    uint32_t  cOut;
     VQUEUESEG aSegsIn[VRING_MAX_SIZE];
     VQUEUESEG aSegsOut[VRING_MAX_SIZE];
@@ -282 +282 @@
 int   vpciRZInit(PPDMDEVINS pDevIns, PVPCISTATE pThis, PVPCISTATECC pThisCC);
 int   vpciR3Term(PPDMDEVINS pDevIns, PVPCISTATE pThis);
-
+PVQUEUE vpciR3AddQueue(PVPCISTATE pThis, PVPCISTATECC pThisCC, unsigned uSize, PFNVPCIQUEUECALLBACK pfnCallback, const char *pcszName);
+void *vpciR3QueryInterface(PVPCISTATECC pThisCC, const char *pszIID);
+void  vpciR3SetWriteLed(PVPCISTATE pThis, bool fOn);
+void  vpciR3SetReadLed(PVPCISTATE pThis, bool fOn);
+int   vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
+int   vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
+void  vpciR3DumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp);
+
+void  vpciReset(PPDMDEVINS pDevIns, PVPCISTATE pThis);
 int   vpciRaiseInterrupt(PPDMDEVINS pDevIns, PVPCISTATE pThis, int rcBusy, uint8_t u8IntCause);
 int   vpciIOPortIn(PPDMDEVINS pDevIns, PVPCISTATE pThis, RTIOPORT offPort,
@@ -288 +296 @@
 int   vpciIOPortOut(PPDMDEVINS pDevIns, PVPCISTATE pThis, PVPCISTATECC pThisCC, RTIOPORT offPort,
                     uint32_t u32, unsigned cb, PCVPCIIOCALLBACKS pCallbacks);
-
-void  vpciR3SetWriteLed(PVPCISTATE pThis, bool fOn);
-void  vpciR3SetReadLed(PVPCISTATE pThis, bool fOn);
-int   vpciR3SaveExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM);
-int   vpciR3LoadExec(PCPDMDEVHLPR3 pHlp, PVPCISTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t cQueues);
-void  vpciReset(PPDMDEVINS pDevIns, PVPCISTATE pThis);
-void *vpciR3QueryInterface(PVPCISTATECC pThisCC, const char *pszIID);
-PVQUEUE vpciR3AddQueue(PVPCISTATE pThis, PVPCISTATECC pThisCC, unsigned uSize, PFNVPCIQUEUECALLBACK pfnCallback, const char *pcszName);
 
 #define VPCI_CS
@@ -347 +347 @@
 }
 
-void vpcR3iDumpStateWorker(PVPCISTATE pThis, PCDBGFINFOHLP pHlp);
-
 #endif /* !VBOX_INCLUDED_SRC_VirtIO_Virtio_h */
+