Changeset 84386 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

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

138082

Message:

Clean up more build warnings

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -676 +676 @@
 }
 
-
+#ifdef LOG_ENABLED
 DECLINLINE(void) virtioNetPrintFeatures(VIRTIONET *pThis)
 {
-#ifdef LOG_ENABLED
     static struct
     {
@@ -727 +726 @@
           "%s\n", pszBuf));
     RTMemFree(pszBuf);
-
-#else  /* !LOG_ENABLED */
-    RT_NOREF(pThis);
-#endif /* !LOG_ENABLED */
-}
-
+}
+#endif
 /*
  * Checks whether negotiated features have required flag combinations.
@@ -1545 +1540 @@
                             VERR_INTERNAL_ERROR);
 
-        uint32_t cbDescChainLeft = pDescChain->cbPhysReturn;
+        size_t cbDescChainLeft = pDescChain->cbPhysReturn;
         uint8_t  cbHdr = sizeof(VIRTIONET_PKT_HDR_T);
 
@@ -1744 +1739 @@
         if (!uFeatures)
         {
-            Log2Func(("GSO type (0x%x) not supported\n", INSTANCE(pThis), pGso->u8Type));
+            Log2Func(("%s GSO type (0x%x) not supported\n", INSTANCE(pThis), pGso->u8Type));
             return VERR_NOT_SUPPORTED;
         }
@@ -1789 +1784 @@
 
 /* Read physical bytes from the out segment(s) of descriptor chain */
-static void virtioNetR3PullChain(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIO_DESC_CHAIN_T pDescChain, void *pv, uint16_t cb)
+static void virtioNetR3PullChain(PPDMDEVINS pDevIns, PVIRTIONET pThis, PVIRTIO_DESC_CHAIN_T pDescChain, void *pv, size_t cb)
 {
     uint8_t *pb = (uint8_t *)pv;
@@ -1835 +1830 @@
 
     uint8_t fOn, fPromiscChanged = false;
-    virtioNetR3PullChain(pDevIns, pThis, pDescChain, &fOn, RT_MIN(pDescChain->cbPhysSend, sizeof(fOn)));
+    virtioNetR3PullChain(pDevIns, pThis, pDescChain, &fOn, (size_t)RT_MIN(pDescChain->cbPhysSend, sizeof(fOn)));
 
     switch(pCtrlPktHdr->uCmd)
@@ -2845 +2840 @@
     Log7Func(("PDM device instance: %d\n", iInstance));
 
-    RTStrPrintf(pThis->szInstanceName, sizeof(pThis->szInstanceName), "VIRTIONET", iInstance);
+    RTStrPrintf(pThis->szInstanceName, sizeof(pThis->szInstanceName), "VIRTIONET%d", iInstance);
 
     pThisCC->pDevIns     = pDevIns;

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

@@ -1215 +1215 @@
     uint32_t const offDataOut = sizeof(REQ_CMD_HDR_T)  + cbCdb;
     uint32_t const offDataIn  = sizeof(REQ_RESP_HDR_T) + cbSenseCfg;
-    uint32_t const cbDataOut  = pDescChain->cbPhysSend - offDataOut;
+    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;