Changeset 84389 in vbox for trunk/src

Timestamp:

May 20, 2020 6:19:44 AM (5 years ago)

Author:

vboxsync

Message:

Fix more windows compiler warnings

Location:

trunk/src/VBox/Devices

Files:

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

-              r84388
+              r84389
     if (pThisCC->pDrv && fPromiscChanged)
+    {
+        bool fPromiscuous = pThis->fPromiscuous | pThis->fAllMulticast;
+        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, (uint8_t)fPromiscuous);
+    }
+        pThisCC->pDrv->pfnSetPromiscuousMode(pThisCC->pDrv, pThis->fPromiscuous | pThis->fAllMulticast);
     return VIRTIONET_OK;
 …
+}
 static int virtioNetR3ReadHeader(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, PVIRTIONET_PKT_HDR_T pPktHdr, uint32_t cbFrame)
+static int virtioNetR3ReadHeader(PPDMDEVINS pDevIns, RTGCPHYS GCPhys, PVIRTIONET_PKT_HDR_T pPktHdr, size_t cbFrame)
+{
     int rc = PDMDevHlpPCIPhysRead(pDevIns, GCPhys, pPktHdr, sizeof(*pPktHdr));

-              r84388
+              r84389
 static int virtioScsiR3ReqErr(PPDMDEVINS pDevIns, PVIRTIOSCSI pThis, PVIRTIOSCSICC pThisCC, uint16_t qIdx,
                               PVIRTIO_DESC_CHAIN_T pDescChain, REQ_RESP_HDR_T *pRespHdr, uint8_t *pbSense,
                               uint32_t cbSenseCfg)
+                              size_t cbSenseCfg)
+{
     Log2Func(("   status: %s    response: %s\n",
 …
+{
     REQ_RESP_HDR_T RespHdr;
     RespHdr.cbSenseLen       = cbSense;
+    RespHdr.cbSenseLen       = cbSense & UINT32_MAX;
     RespHdr.uResidual        = cbResidual;
     RespHdr.uStatusQualifier = 0;
 …
         respHdr.uStatus    = SCSI_STATUS_CHECK_CONDITION;
         respHdr.uResponse  = VIRTIOSCSI_S_OVERRUN;
         respHdr.uResidual  = pReq->cbDataIn;
+        respHdr.uResidual  = pReq->cbDataIn & UINT32_MAX;
         virtioScsiR3ReqErr(pDevIns, pThis, pThisCC, pReq->qIdx, pReq->pDescChain, &respHdr, abSense,

Note: See TracChangeset for help on using the changeset viewer.