Changeset 84391 in vbox for trunk/src/VBox

Timestamp:

May 20, 2020 6:38:33 AM (5 years ago)

Author:

vboxsync

Message:

Fix more windows compiler warnings

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -1863 +1863 @@
 
     if (pThisCC->pDrv && fPromiscChanged)
+    {
         if (pThis->fPromiscuous | pThis->fAllMulticast)
+        {
             pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, true);
+        }
         else
+        {
             pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, false);
+        }
+    }
 
     return VIRTIONET_OK;
@@ -2753 +2759 @@
     RT_NOREF(pThis);
 
-//    int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pDevIns->IBase, &pThisCC->pDrvBase, "Network Port");
     int rc = PDMDevHlpDriverAttach(pDevIns, 0, &pThisCC->IBase, &pThisCC->pDrvBase, "Network Port");
     if (RT_SUCCESS(rc))
@@ -2766 +2771 @@
 
     LEAVE_CRITICAL_SECTION;
-    return rc;
-
     AssertRelease(!pThisCC->pDrvBase);
     return rc;

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

@@ -886 +886 @@
     REQ_RESP_HDR_T RespHdr;
     RespHdr.cbSenseLen       = cbSense & UINT32_MAX;
-    RespHdr.uResidual        = cbResidual;
+    RespHdr.uResidual        = cbResidual & UINT32_MAX;
     RespHdr.uStatusQualifier = 0;
     RespHdr.uStatus          = bStatus;
@@ -1338 +1338 @@
         respHdr.uStatus    = SCSI_STATUS_CHECK_CONDITION;
         respHdr.uResponse  = VIRTIOSCSI_S_FAILURE;
-        respHdr.uResidual  = cbDataIn + cbDataOut;
+        respHdr.uResidual  = (cbDataIn + cbDataOut) & UINT32_MAX;
         virtioScsiR3ReqErr(pDevIns, pThis, pThisCC, qIdx, pDescChain, &respHdr, abSense, cbSenseCfg);
         virtioScsiR3FreeReq(pTarget, pReq);