Changeset 84388 in vbox for trunk/src/VBox/Devices

Timestamp:

May 20, 2020 6:01:50 AM (5 years ago)

Author:

vboxsync

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

138084

Message:

Fix more windows compiler warnings

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (4 diffs)
• Storage/DevVirtioSCSI.cpp (modified) (3 diffs)

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

@@ -1517 +1517 @@
     RTGCPHYS gcPhysPktHdrNumBuffers = 0;
     uint16_t cDescs;
-    uint32_t uOffset;
+    uint64_t uOffset;
     for (cDescs = uOffset = 0; uOffset < cb; )
     {
@@ -1864 +1864 @@
     if (pThisCC->pDrv && fPromiscChanged)
     {
-        uint8_t fPromiscuous = pThis->fPromiscuous | pThis->fAllMulticast;
-        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, fPromiscuous);
+        bool fPromiscuous = pThis->fPromiscuous | pThis->fAllMulticast;
+        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, (uint8_t)fPromiscuous);
     }
 
@@ -1952 +1952 @@
 
     uint16_t uVlanId;
-    uint16_t cbRemaining = pDescChain->cbPhysSend - sizeof(*pCtrlPktHdr);
+    size_t cbRemaining = pDescChain->cbPhysSend - sizeof(*pCtrlPktHdr);
     AssertMsgReturn(cbRemaining > sizeof(uVlanId),
         ("DESC chain too small for VIRTIO_NET_CTRL_VLAN cmd processing"), VIRTIONET_ERROR);
@@ -2239 +2239 @@
 
         VIRTIONET_PKT_HDR_T PktHdr;
-        uint32_t uSize = 0;
+        size_t uSize = 0;
 
         Assert(paSegsFromGuest[0].cbSeg >= sizeof(PktHdr));

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

@@ -556 +556 @@
     uint16_t                       qIdx;                        /**< Index of queue this request arrived on            */
     PVIRTIO_DESC_CHAIN_T           pDescChain;                  /**< Prepared desc chain pulled from virtq avail ring  */
-    uint32_t                       cbDataIn;                    /**< size of dataout buffer                            */
-    uint32_t                       cbDataOut;                   /**< size of dataout buffer                            */
+    size_t                         cbDataIn;                    /**< size of dataout buffer                            */
+    size_t                         cbDataOut;                   /**< size of dataout buffer                            */
     uint16_t                       uDataInOff;                  /**< Fixed size of respHdr + sense (precede datain)    */
     uint16_t                       uDataOutOff;                 /**< Fixed size of respHdr + sense (precede datain)    */
@@ -882 +882 @@
 static int virtioScsiR3ReqErr4(PPDMDEVINS pDevIns, PVIRTIOSCSI pThis, PVIRTIOSCSICC pThisCC, uint16_t qIdx,
                                PVIRTIO_DESC_CHAIN_T pDescChain, uint32_t cbResidual, uint8_t bStatus, uint8_t bResponse,
-                               uint8_t *pbSense, uint32_t cbSense, uint32_t cbSenseCfg)
+                               uint8_t *pbSense, size_t cbSense, size_t cbSenseCfg)
 {
     REQ_RESP_HDR_T RespHdr;
@@ -1217 +1217 @@
     size_t   const cbDataOut  = pDescChain->cbPhysSend - offDataOut;
     /** @todo r=bird: Validate cbPhysReturn properly? I've just RT_MAX'ed it for now. */
-    uint32_t const cbDataIn   = RT_MAX(pDescChain->cbPhysReturn, offDataIn) - offDataIn;
+    size_t   const cbDataIn   = RT_MAX(pDescChain->cbPhysReturn, offDataIn) - offDataIn;
     Assert(offDataOut <= UINT16_MAX);
     Assert(offDataIn  <= UINT16_MAX);