Changeset 62962 in vbox

Timestamp:

Aug 4, 2016 9:00:52 AM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings

Location:

trunk/src/VBox/Devices

Files:

• Network/DevE1000.cpp (modified) (24 diffs)
• Network/DevVirtioNet.cpp (modified) (14 diffs)
• Network/DrvNetShaper.cpp (modified) (2 diffs)
• Network/DrvUDPTunnel.cpp (modified) (7 diffs)
• VirtIO/Virtio.cpp (modified) (1 diff)

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

@@ -2689 +2689 @@
 static int e1kRegWriteEECD(PE1KSTATE pThis, uint32_t offset, uint32_t index, uint32_t value)
 {
+    RT_NOREF(offset, index);
 #ifdef IN_RING3
     /* So far we are concerned with lower byte only */
@@ -2707 +2708 @@
     return VINF_SUCCESS;
 #else /* !IN_RING3 */
-    RT_NOREF_PV(pThis); RT_NOREF_PV(offset); RT_NOREF_PV(index); RT_NOREF_PV(value);
+    RT_NOREF(pThis, value);
     return VINF_IOM_R3_MMIO_WRITE;
 #endif /* !IN_RING3 */
@@ -3191 +3192 @@
 
 #ifdef IN_RING3
-#ifdef E1K_TX_DELAY
-
+
+# ifdef E1K_TX_DELAY
 /**
  * Transmit Delay Timer handler.
@@ -3209 +3210 @@
 
     E1K_INC_ISTAT_CNT(pThis->uStatTxDelayExp);
-#ifdef E1K_INT_STATS
+#  ifdef E1K_INT_STATS
     uint64_t u64Elapsed = RTTimeNanoTS() - pThis->u64ArmedAt;
     if (u64Elapsed > pThis->uStatMaxTxDelay)
         pThis->uStatMaxTxDelay = u64Elapsed;
-#endif
+#  endif
     int rc = e1kXmitPending(pThis, false /*fOnWorkerThread*/);
     AssertMsg(RT_SUCCESS(rc) || rc == VERR_TRY_AGAIN, ("%Rrc\n", rc));
 }
-#endif /* E1K_TX_DELAY */
-
-#ifdef E1K_USE_TX_TIMERS
+# endif /* E1K_TX_DELAY */
+
+# ifdef E1K_USE_TX_TIMERS
 
 /**
@@ -3237 +3238 @@
     E1K_INC_ISTAT_CNT(pThis->uStatTID);
     /* Cancel absolute delay timer as we have already got attention */
-#ifndef E1K_NO_TAD
+#  ifndef E1K_NO_TAD
     e1kCancelTimer(pThis, pThis->CTX_SUFF(pTADTimer));
-#endif /* E1K_NO_TAD */
+#  endif /* E1K_NO_TAD */
     e1kRaiseInterrupt(pThis, ICR_TXDW);
 }
@@ -3263 +3264 @@
 }
 
-#endif /* E1K_USE_TX_TIMERS */
-#ifdef E1K_USE_RX_TIMERS
+# endif /* E1K_USE_TX_TIMERS */
+# ifdef E1K_USE_RX_TIMERS
 
 /**
@@ -3306 +3307 @@
 }
 
-#endif /* E1K_USE_RX_TIMERS */
+# endif /* E1K_USE_RX_TIMERS */
 
 /**
@@ -3318 +3319 @@
 static DECLCALLBACK(void) e1kLateIntTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns, pTimer);
     PE1KSTATE pThis = (PE1KSTATE )pvUser;
 
@@ -3323 +3325 @@
     STAM_COUNTER_INC(&pThis->StatLateInts);
     E1K_INC_ISTAT_CNT(pThis->uStatIntLate);
-#if 0
+# if 0
     if (pThis->iStatIntLost > -100)
         pThis->iStatIntLost--;
-#endif
+# endif
     e1kRaiseInterrupt(pThis, VERR_SEM_BUSY, 0);
     STAM_PROFILE_ADV_STOP(&pThis->StatLateIntTimer, a);
@@ -3341 +3343 @@
 static DECLCALLBACK(void) e1kLinkUpTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns, pTimer);
     PE1KSTATE pThis = (PE1KSTATE )pvUser;
 
@@ -5310 +5313 @@
     E1kLog2(("%s e1kTxQueueConsumer:\n", pThis->szPrf));
 
-    int rc = e1kXmitPending(pThis, false /*fOnWorkerThread*/);
+    int rc = e1kXmitPending(pThis, false /*fOnWorkerThread*/); NOREF(rc);
 #ifndef DEBUG_andy /** @todo r=andy Happens for me a lot, mute this for me. */
     AssertMsg(RT_SUCCESS(rc) || rc == VERR_TRY_AGAIN, ("%Rrc\n", rc));
@@ -5322 +5325 @@
 static DECLCALLBACK(bool) e1kCanRxQueueConsumer(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem)
 {
+    RT_NOREF(pItem);
     e1kWakeupReceive(pDevIns);
     return true;
@@ -6016 +6020 @@
 static void e1kDumpState(PE1KSTATE pThis)
 {
+    RT_NOREF(pThis);
     for (int i = 0; i < E1K_NUM_OF_32BIT_REGS; ++i)
-    {
-        E1kLog2(("%s %8.8s = %08x\n", pThis->szPrf,
-                g_aE1kRegMap[i].abbrev, pThis->auRegs[i]));
-    }
+        E1kLog2(("%s %8.8s = %08x\n", pThis->szPrf, g_aE1kRegMap[i].abbrev, pThis->auRegs[i]));
 # ifdef E1K_INT_STATS
     LogRel(("%s Interrupt attempts: %d\n", pThis->szPrf, pThis->uStatIntTry));
@@ -6069 +6071 @@
 static DECLCALLBACK(int) e1kMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
 {
+    RT_NOREF(iRegion);
     PE1KSTATE pThis = PDMINS_2_DATA(pPciDev->pDevIns, E1KSTATE*);
     int       rc;
@@ -6579 +6582 @@
 static DECLCALLBACK(int) e1kLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
 {
+    RT_NOREF(uPass);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
     e1kSaveConfig(pThis, pSSM);
@@ -6589 +6593 @@
 static DECLCALLBACK(int) e1kSavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
 
@@ -6693 +6698 @@
 static DECLCALLBACK(int) e1kLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
 
@@ -6811 +6817 @@
 static DECLCALLBACK(int) e1kLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
 
@@ -6848 +6855 @@
                                          void *pvUser)
 {
+    RT_NOREF(cchWidth,  cchPrecision,  fFlags, pvUser);
     AssertReturn(strcmp(pszType, "e1krxd") == 0, 0);
     E1KRXDESC* pDesc = (E1KRXDESC*)pvValue;
@@ -6886 +6894 @@
                                          void *pvUser)
 {
+    RT_NOREF(cchWidth, cchPrecision, fFlags, pvUser);
     AssertReturn(strcmp(pszType, "e1ktxd") == 0, 0);
     E1KTXDESC *pDesc = (E1KTXDESC*)pvValue;
@@ -6985 +6994 @@
 static DECLCALLBACK(void) e1kInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
+    RT_NOREF(pszArgs);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
     unsigned  i;
@@ -7145 +7155 @@
 static DECLCALLBACK(void) e1kR3Detach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
     Log(("%s e1kR3Detach:\n", pThis->szPrf));
@@ -7181 +7192 @@
 static DECLCALLBACK(int) e1kR3Attach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
     LogFlow(("%s e1kR3Attach:\n",  pThis->szPrf));
@@ -7295 +7307 @@
 static DECLCALLBACK(void) e1kR3Relocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
+    RT_NOREF(offDelta);
     PE1KSTATE pThis = PDMINS_2_DATA(pDevIns, E1KSTATE*);
     pThis->pDevInsRC     = PDMDEVINS_2_RCPTR(pDevIns);

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

@@ -539 +539 @@
 static DECLCALLBACK(void) vnetLinkUpTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pTimer);
     PVNETSTATE pThis = (PVNETSTATE)pvUser;
 
@@ -559 +560 @@
 static DECLCALLBACK(bool) vnetCanRxQueueConsumer(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem)
 {
+    RT_NOREF(pItem);
     vnetWakeupReceive(pDevIns);
     return true;
@@ -1068 +1070 @@
 static DECLCALLBACK(void) vnetQueueReceive(void *pvState, PVQUEUE pQueue)
 {
+    RT_NOREF(pQueue);
     PVNETSTATE pThis = (PVNETSTATE)pvState;
     Log(("%s Receive buffers has been added, waking up receive thread.\n", INSTANCE(pThis)));
@@ -1320 +1323 @@
     if (TMTimerIsActive(pThis->CTX_SUFF(pTxTimer)))
     {
-        int rc = TMTimerStop(pThis->CTX_SUFF(pTxTimer));
+        TMTimerStop(pThis->CTX_SUFF(pTxTimer));
         Log3(("%s vnetQueueTransmit: Got kicked with notification disabled, re-enable notification and flush TX queue\n", INSTANCE(pThis)));
         vnetTransmitPendingPackets(pThis, pQueue, false /*fOnWorkerThread*/);
@@ -1350 +1353 @@
 static DECLCALLBACK(void) vnetTxTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns, pTimer);
     PVNETSTATE pThis = (PVNETSTATE)pvUser;
 
@@ -1538 +1542 @@
     while (vqueueGet(&pThis->VPCI, pQueue, &elem))
     {
-        unsigned int uOffset = 0;
         if (elem.nOut < 1 || elem.aSegsOut[0].cb < sizeof(VNETCTLHDR))
         {
@@ -1602 +1605 @@
 static DECLCALLBACK(int) vnetLiveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass)
 {
+    RT_NOREF(uPass);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
     vnetSaveConfig(pThis, pSSM);
@@ -1613 +1617 @@
 static DECLCALLBACK(int) vnetSavePrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
 
@@ -1661 +1666 @@
 static DECLCALLBACK(int) vnetLoadPrep(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
 
@@ -1739 +1745 @@
 static DECLCALLBACK(int) vnetLoadDone(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
+    RT_NOREF(pSSM);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
 
@@ -1760 +1767 @@
  * @callback_method_impl{FNPCIIOREGIONMAP}
  */
-static DECLCALLBACK(int) vnetMap(PPCIDEVICE pPciDev, int iRegion,
-                                 RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
-{
+static DECLCALLBACK(int) vnetMap(PPCIDEVICE pPciDev, int iRegion, RTGCPHYS GCPhysAddress, uint32_t cb, PCIADDRESSSPACE enmType)
+{
+    RT_NOREF(iRegion);
     PVNETSTATE pThis = PDMINS_2_DATA(pPciDev->pDevIns, PVNETSTATE);
     int       rc;
@@ -1799 +1806 @@
 static DECLCALLBACK(void) vnetDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
     Log(("%s vnetDetach:\n", INSTANCE(pThis)));
@@ -1826 +1834 @@
 static DECLCALLBACK(int) vnetAttach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PVNETSTATE pThis = PDMINS_2_DATA(pDevIns, PVNETSTATE);
     LogFlow(("%s vnetAttach:\n",  INSTANCE(pThis)));
@@ -2066 +2075 @@
 
     pThis->u32i = pThis->u32AvgDiff = pThis->u32MaxDiff = 0;
-    pThis->u32MinDiff = ~0;
+    pThis->u32MinDiff = UINT32_MAX;
 #endif /* VNET_TX_DELAY */
 

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

@@ -313 +313 @@
 static DECLCALLBACK(RTRCPTR) drvR3NetShaperIBaseRC_QueryInterface(PPDMIBASERC pInterface, const char *pszIID)
 {
+    RT_NOREF(pInterface, pszIID);
     return NIL_RTRCPTR;
 }
@@ -338 +339 @@
 static DECLCALLBACK(void) drvR3NetShaperDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     PDRVNETSHAPER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSHAPER);
 

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

@@ -113 +113 @@
 static DECLCALLBACK(int) drvUDPTunnelUp_BeginXmit(PPDMINETWORKUP pInterface, bool fOnWorkerThread)
 {
+    RT_NOREF(fOnWorkerThread);
     PDRVUDPTUNNEL pThis = PDMINETWORKUP_2_DRVUDPTUNNEL(pInterface);
     int rc = RTCritSectTryEnter(&pThis->XmitLock);
@@ -127 +128 @@
  */
 static DECLCALLBACK(int) drvUDPTunnelUp_AllocBuf(PPDMINETWORKUP pInterface, size_t cbMin,
-                                                  PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
+                                                 PCPDMNETWORKGSO pGso, PPPDMSCATTERGATHER ppSgBuf)
 {
     PDRVUDPTUNNEL pThis = PDMINETWORKUP_2_DRVUDPTUNNEL(pInterface);
-    Assert(RTCritSectIsOwner(&pThis->XmitLock));
+    Assert(RTCritSectIsOwner(&pThis->XmitLock)); NOREF(pThis);
 
     /*
@@ -175 +176 @@
 {
     PDRVUDPTUNNEL pThis = PDMINETWORKUP_2_DRVUDPTUNNEL(pInterface);
-    Assert(RTCritSectIsOwner(&pThis->XmitLock));
+    Assert(RTCritSectIsOwner(&pThis->XmitLock)); NOREF(pThis);
     if (pSgBuf)
     {
@@ -191 +192 @@
 static DECLCALLBACK(int) drvUDPTunnelUp_SendBuf(PPDMINETWORKUP pInterface, PPDMSCATTERGATHER pSgBuf, bool fOnWorkerThread)
 {
+    RT_NOREF(fOnWorkerThread);
     PDRVUDPTUNNEL pThis = PDMINETWORKUP_2_DRVUDPTUNNEL(pInterface);
     STAM_COUNTER_INC(&pThis->StatPktSent);
@@ -224 +226 @@
         uint32_t const  cSegs   = PDMNetGsoCalcSegmentCount(pGso, pSgBuf->cbUsed);  Assert(cSegs > 1);
         rc = VINF_SUCCESS;
-        for (size_t iSeg = 0; iSeg < cSegs; iSeg++)
+        for (uint32_t iSeg = 0; iSeg < cSegs; iSeg++)
         {
             uint32_t cbSegFrame;
@@ -264 +266 @@
 static DECLCALLBACK(void) drvUDPTunnelUp_SetPromiscuousMode(PPDMINETWORKUP pInterface, bool fPromiscuous)
 {
+    RT_NOREF(pInterface, fPromiscuous);
     LogFlowFunc(("fPromiscuous=%d\n", fPromiscuous));
     /* nothing to do */
@@ -450 +453 @@
 static DECLCALLBACK(int) drvUDPTunnelConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
+    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVUDPTUNNEL pThis = PDMINS_2_DATA(pDrvIns, PDRVUDPTUNNEL);
-    PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
     /*

trunk/src/VBox/Devices/VirtIO/Virtio.cpp

@@ -917 +917 @@
 void vpciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    VPCISTATE* pState = PDMINS_2_DATA(pDevIns, VPCISTATE*);
-    pState->pDevInsRC     = PDMDEVINS_2_RCPTR(pDevIns);
+    RT_NOREF(offDelta);
+    VPCISTATE *pState = PDMINS_2_DATA(pDevIns, VPCISTATE*);
+    pState->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     // TBD
 }