Changeset 63478 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Aug 15, 2016 2:04:10 PM (8 years ago)

Author:

vboxsync

Message:

Devices: warnings (clang)

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (18 diffs)
• DevVirtioNet.cpp (modified) (4 diffs)
• DrvIntNet.cpp (modified) (6 diffs)
• DrvNAT.cpp (modified) (1 diff)
• SrvIntNetR0.cpp (modified) (4 diffs)
• slirp/ip_icmp.c (modified) (1 diff)
• slirp/tftp.c (modified) (2 diffs)

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

@@ -218 +218 @@
 #define E1K_CHIP_82545EM 2
 
+#ifdef IN_RING3
 /** Different E1000 chips. */
 static const struct E1kChips
@@ -226 +227 @@
     uint16_t uPCISubsystemId;
     const char *pcszName;
-} g_Chips[] =
+} g_aChips[] =
 {
     /* Vendor Device SSVendor SubSys  Name */
     { 0x8086,
       /* Temporary code, as MSI-aware driver dislike 0x100E. How to do that right? */
-#ifdef E1K_WITH_MSI
+# ifdef E1K_WITH_MSI
       0x105E,
-#else
+# else
       0x100E,
-#endif
+# endif
                       0x8086, 0x001E, "82540EM" }, /* Intel 82540EM-A in Intel PRO/1000 MT Desktop */
     { 0x8086, 0x1004, 0x8086, 0x1004, "82543GC" }, /* Intel 82543GC   in Intel PRO/1000 T  Server */
     { 0x8086, 0x100F, 0x15AD, 0x0750, "82545EM" }  /* Intel 82545EM-A in VMWare Network Adapter */
 };
+#endif /* IN_RING3 */
 
 
@@ -1552 +1554 @@
 }
 
+#ifdef IN_RING3
 /**
  * Cancel a timer.
@@ -1568 +1571 @@
     RT_NOREF1(pThis);
 }
+#endif /* IN_RING3 */
 
 #define e1kCsEnter(ps, rc) PDMCritSectEnter(&ps->cs, rc)
@@ -1748 +1752 @@
 }
 
+
+#if defined(E1K_WITH_RXD_CACHE) && defined(IN_RING3) /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Dump receive descriptor to debug log.
@@ -1777 +1783 @@
              E1K_SPEC_PRI(pDesc->status.u16Special)));
 }
+#endif /* E1K_WITH_RXD_CACHE && IN_RING3 */
 
 /**
@@ -1954 +1961 @@
 }
 
+#ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Advance the head pointer of the receive descriptor queue.
@@ -1992 +2000 @@
     //e1kCsLeave(pThis);
 }
+#endif /* IN_RING3 */
 
 #ifdef E1K_WITH_RXD_CACHE
+
 /**
  * Return the number of RX descriptor that belong to the hardware.
@@ -2087 +2097 @@
 }
 
+# ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
+
 /**
  * Obtain the next RX descriptor from RXD cache, fetching descriptors from the
@@ -2111 +2123 @@
     return NULL;
 }
+
 
 /**
@@ -2136 +2149 @@
 }
 
-# ifdef IN_RING3 /* currently only used in ring-3 due to stack space requirements of the caller */
 /**
  * Store a fragment of received packet at the specifed address.
@@ -2154 +2166 @@
     STAM_PROFILE_ADV_STOP(&pThis->StatReceiveStore, a);
 }
+
 # endif
 
@@ -2206 +2219 @@
     STAM_PROFILE_ADV_STOP(&pThis->StatReceiveStore, a);
 }
+
 #endif /* !E1K_WITH_RXD_CACHE */
 
@@ -3244 +3258 @@
 #  ifndef E1K_NO_TAD
     e1kCancelTimer(pThis, pThis->CTX_SUFF(pTADTimer));
-#  endif /* E1K_NO_TAD */
+#  endif
     e1kRaiseInterrupt(pThis, ICR_TXDW);
 }
@@ -4451 +4465 @@
                 /* Cancel both timers if armed and fire immediately. */
                 e1kCancelTimer(pThis, pThis->CTX_SUFF(pTADTimer));
-# endif /* E1K_NO_TAD */
+# endif
 #endif /* E1K_USE_TX_TIMERS */
                 E1K_INC_ISTAT_CNT(pThis->uStatIntTx);
@@ -7018 +7032 @@
     pHlp->pfnPrintf(pHlp, "E1000 #%d: port=%RTiop mmio=%RGp mac-cfg=%RTmac %s%s%s\n",
                     pDevIns->iInstance, pThis->IOPortBase, pThis->addrMMReg,
-                    &pThis->macConfigured, g_Chips[pThis->eChip].pcszName,
+                    &pThis->macConfigured, g_aChips[pThis->eChip].pcszName,
                     pThis->fRCEnabled ? " GC" : "", pThis->fR0Enabled ? " R0" : "");
 
@@ -7375 +7389 @@
 static DECLCALLBACK(void) e1kConfigurePciDev(PPCIDEVICE pPciDev, E1KCHIP eChip)
 {
-    Assert(eChip < RT_ELEMENTS(g_Chips));
+    Assert(eChip < RT_ELEMENTS(g_aChips));
     /* Configure PCI Device, assume 32-bit mode ******************************/
-    PCIDevSetVendorId(pPciDev, g_Chips[eChip].uPCIVendorId);
-    PCIDevSetDeviceId(pPciDev, g_Chips[eChip].uPCIDeviceId);
-    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_VENDOR_ID, g_Chips[eChip].uPCISubsystemVendorId);
-    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_ID, g_Chips[eChip].uPCISubsystemId);
+    PCIDevSetVendorId(pPciDev, g_aChips[eChip].uPCIVendorId);
+    PCIDevSetDeviceId(pPciDev, g_aChips[eChip].uPCIDeviceId);
+    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_VENDOR_ID, g_aChips[eChip].uPCISubsystemVendorId);
+    PCIDevSetWord( pPciDev, VBOX_PCI_SUBSYSTEM_ID, g_aChips[eChip].uPCISubsystemId);
 
     PCIDevSetWord( pPciDev, VBOX_PCI_COMMAND,            0x0000);
@@ -7568 +7582 @@
 
     LogRel(("%s Chip=%s LinkUpDelay=%ums EthernetCRC=%s GSO=%s Itr=%s ItrRx=%s R0=%s GC=%s\n", pThis->szPrf,
-            g_Chips[pThis->eChip].pcszName, pThis->cMsLinkUpDelay,
+            g_aChips[pThis->eChip].pcszName, pThis->cMsLinkUpDelay,
             pThis->fEthernetCRC ? "on" : "off",
             pThis->fGSOEnabled ? "enabled" : "disabled",

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

@@ -274 +274 @@
 AssertCompileSize(VNETCTLHDR, 2);
 
+#ifdef IN_RING3
+
 /** Returns true if large packets are written into several RX buffers. */
 DECLINLINE(bool) vnetMergeableRxBuffers(PVNETSTATE pThis)
@@ -289 +291 @@
     vpciCsLeave(&pThis->VPCI);
 }
+
+#endif /* IN_RING3 */
 
 DECLINLINE(int) vnetCsRxEnter(PVNETSTATE pThis, int rcBusy)
@@ -307 +311 @@
 }
 
+#ifdef IN_RING3
 /**
  * Dump a packet to debug log.
@@ -317 +322 @@
 DECLINLINE(void) vnetPacketDump(PVNETSTATE pThis, const uint8_t *pbPacket, size_t cb, const char *pszText)
 {
-#ifdef DEBUG
+# ifdef DEBUG
     Log(("%s %s packet #%d (%d bytes):\n",
          INSTANCE(pThis), pszText, ++pThis->u32PktNo, cb));
     Log3(("%.*Rhxd\n", cb, pbPacket));
-#else
+# else
     RT_NOREF4(pThis, pbPacket, cb, pszText);
-#endif
-}
+# endif
+}
+#endif /* IN_RING3 */
 
 /**

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

@@ -269 +269 @@
  * @param   pThis               The instance data..
  */
-DECLINLINE(int) drvIntNetSignalXmit(PDRVINTNET pThis)
+DECLINLINE(int) drvR0IntNetSignalXmit(PDRVINTNET pThis)
 {
     /// @todo if (!ASMAtomicXchgBool(&pThis->fXmitSignalled, true)) - needs careful optimizing.
@@ -279 +279 @@
     return VERR_TRY_AGAIN;
 }
-#endif
+#endif /* !IN_RING3 */
 
 
@@ -306 +306 @@
     {
         ASMAtomicUoWriteBool(&pThis->fXmitProcessRing, true);
-        drvIntNetSignalXmit(pThis);
+        drvR0IntNetSignalXmit(pThis);
         rc = VINF_SUCCESS;
     }
@@ -351 +351 @@
         rc = VERR_TRY_AGAIN;
 #else  /* IN_RING0 */
-        rc = drvIntNetSignalXmit(pThis);
+        rc = drvR0IntNetSignalXmit(pThis);
 #endif /* IN_RING0 */
     }
@@ -381 +381 @@
     PPDMSCATTERGATHER pSgBuf = &pThis->u.Sg;
     if (RT_UNLIKELY(pSgBuf->fFlags != 0))
-        return drvIntNetSignalXmit(pThis);
+        return drvR0IntNetSignalXmit(pThis);
 #endif
 
@@ -444 +444 @@
     {
         pThis->fXmitProcessRing = true;
-        rc = drvIntNetSignalXmit(pThis);
+        rc = drvR0IntNetSignalXmit(pThis);
     }
     else

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

@@ -1145 +1145 @@
             else
                 LogRel(("NAT: DNS server list is empty (2)\n"));
+#else
+            RT_NOREF(hDynStor);
 #endif
             drvNATUpdateDNS(pThis, /* fFlapLink */ true);

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

@@ -897 +897 @@
     return Addr.u == UINT32_MAX;
 }
-#endif
+#endif /* unused */
 
 
@@ -1032 +1032 @@
     return intnetR0IfAddrCacheLookup(pCache, pAddr, cbAddr);
 }
-
 
 #if 0 /* unused */
@@ -1220 +1219 @@
 
 #if 0 /* unused */
-
 /**
  * Deletes the address from all the interface caches except the specified one.
@@ -1252 +1250 @@
     RTSpinlockRelease(pNetwork->hAddrSpinlock);
 }
-
-#endif
+#endif /* unused */
 
 

trunk/src/VBox/Devices/Network/slirp/ip_icmp.c

@@ -64 +64 @@
 /* The message sent when emulating PING */
 /* Be nice and tell them it's just a psuedo-ping packet */
-#if 0
+#if 0 /* unused */
 static const char icmp_ping_msg[] = "This is a psuedo-PING packet used by Slirp to emulate ICMP ECHO-REQUEST packets.\n";
 #endif

trunk/src/VBox/Devices/Network/slirp/tftp.c

@@ -196 +196 @@
 
 
+#if 0 /* unused */
 DECLINLINE(bool) tftpIsAcceptableOption(const char *pszOptionName)
 {
@@ -214 +215 @@
     return false;
 }
+#endif /* unused */