Changeset 84384 in vbox for trunk/src/VBox

Timestamp:

May 20, 2020 5:07:26 AM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Fix some Windows build warnings and check for more

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (4 diffs)
• VirtIO/Virtio_1_0.h (modified) (1 diff)

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

@@ -717 +717 @@
     for (unsigned i = 0; i < RT_ELEMENTS(s_aFeatures); ++i)
     {
-        bool isOffered = fFeaturesOfferedMask & s_aFeatures[i].fFeatureBit;
-        bool isNegotiated = pThis->fNegotiatedFeatures & s_aFeatures[i].fFeatureBit;
+        uint64_t isOffered = fFeaturesOfferedMask & s_aFeatures[i].fFeatureBit;
+        uint64_t isNegotiated = pThis->fNegotiatedFeatures & s_aFeatures[i].fFeatureBit;
         cp += RTStrPrintf(cp, cbBuf - (cp - pszBuf), "        %s       %s   %s",
                           isOffered ? "+" : "-", isNegotiated ? "x" : " ", s_aFeatures[i].pcszDesc);
@@ -787 +787 @@
                  || offConfig == RT_UOFFSETOF(VIRTIONET_CONFIG_T, member) + sizeof(uint32_t)) \
              && cb == sizeof(uint32_t)) \
-         || (   offConfig >= RT_UOFFSETOF(VIRTIONET_CONFIG_T, member) \
-             && offConfig + cb <= RT_UOFFSETOF(VIRTIONET_CONFIG_T, member) \
-                                + RT_SIZEOFMEMB(VIRTIONET_CONFIG_T, member)) )
+         || (offConfig + cb <= RT_UOFFSETOF(VIRTIONET_CONFIG_T, member) \
+                             + RT_SIZEOFMEMB(VIRTIONET_CONFIG_T, member)) )
 
 #ifdef LOG_ENABLED
@@ -1579 +1578 @@
 
             /* Append remaining Rx pkt or as much current desc chain has room for */
-            uint32_t cbCropped = RT_MIN(cb, cbDescChainLeft);
+            size_t cbCropped = RT_MIN(cb, cbDescChainLeft);
             paVirtSegsToGuest[cSegs].cbSeg = cbCropped;
             paVirtSegsToGuest[cSegs].pvSeg = ((uint8_t *)pvBuf) + uOffset;
@@ -1793 +1792 @@
 {
     uint8_t *pb = (uint8_t *)pv;
-    uint16_t cbLim = RT_MIN(pDescChain->cbPhysSend, cb);
+    size_t cbLim = RT_MIN(pDescChain->cbPhysSend, cb);
     while (cbLim)
     {

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

@@ -101 +101 @@
     uint32_t volatile   cRefs;                                      /**< Reference counter. */
     uint32_t            uHeadIdx;                                   /**< Head idx of associated desc chain        */
-    uint32_t            cbPhysSend;                                 /**< Total size of src buffer                 */
+    size_t              cbPhysSend;                                 /**< Total size of src buffer                 */
     PVIRTIOSGBUF        pSgPhysSend;                                /**< Phys S/G/ buf for data from guest        */
-    uint32_t            cbPhysReturn;                               /**< Total size of dst buffer                 */
+    size_t              cbPhysReturn;                               /**< Total size of dst buffer                 */
     PVIRTIOSGBUF        pSgPhysReturn;                              /**< Phys S/G buf to store result for guest   */