Changeset 84390 in vbox for trunk/src

Timestamp:

May 20, 2020 6:27:41 AM (5 years ago)

Author:

vboxsync

Message:

Fix more windows compiler warnings

Location:

trunk/src/VBox/Devices

Files:

• Network/DevVirtioNet_1_0.cpp (modified) (1 diff)
• Storage/DevVirtioSCSI.cpp (modified) (2 diffs)

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

@@ -1863 +1863 @@
 
     if (pThisCC->pDrv && fPromiscChanged)
-        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, pThis->fPromiscuous | pThis->fAllMulticast);
+        if (pThis->fPromiscuous | pThis->fAllMulticast)
+            pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, true);
+        else
+            pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, false);
 
     return VIRTIONET_OK;

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

@@ -881 +881 @@
  */
 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,
+                               PVIRTIO_DESC_CHAIN_T pDescChain, size_t cbResidual, uint8_t bStatus, uint8_t bResponse,
                                uint8_t *pbSense, size_t cbSense, size_t cbSenseCfg)
 {
@@ -1195 +1195 @@
          * vague and confusing part of the VirtIO spec (which deviates from the SCSI standard).
          * I have not been able to determine how to implement this properly.  I've checked the
-         * source code of Guest drivers, so far, and none I've found use it. If logs show
-         * this warning implementing it can be re-visited */
+         * source code of Guest drivers, and so far none seem to use it. If logs show
+         * this warning, implementing it can be re-visited */
         uScsiLun = 0xff;
     }