Index: /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp	(revision 43227)
+++ /trunk/src/VBox/VMM/VMMR3/PDMNetShaper.cpp	(revision 43228)
@@ -1,6 +1,5 @@
 /* $Id$ */
 /** @file
- * PDM Network Shaper - Limit network traffic according to bandwidth
- * group settings.
+ * PDM Network Shaper - Limit network traffic according to bandwidth group settings.
  */
 
@@ -67,7 +66,6 @@
 
 
-/*******************************************************************************
-*   Internal Functions                                                         *
-*******************************************************************************/
+
+
 
 static PPDMNSBWGROUP pdmNsBwGroupFindById(PPDMNETSHAPER pShaper, const char *pcszId)
@@ -90,4 +88,5 @@
 }
 
+
 static void pdmNsBwGroupLink(PPDMNSBWGROUP pBwGroup)
 {
@@ -100,4 +99,5 @@
     rc = RTCritSectLeave(&pShaper->cs); AssertRC(rc);
 }
+
 
 #if 0
@@ -123,4 +123,5 @@
 }
 #endif
+
 
 static void pdmNsBwGroupSetLimit(PPDMNSBWGROUP pBwGroup, uint64_t cbTransferPerSecMax)
@@ -132,4 +133,5 @@
                  pBwGroup->cbTransferPerSecMax, pBwGroup->cbBucketSize));
 }
+
 
 static int pdmNsBwGroupCreate(PPDMNETSHAPER pShaper, const char *pcszBwGroup, uint64_t cbTransferPerSecMax)
@@ -160,5 +162,5 @@
 
                     pdmNsBwGroupSetLimit(pBwGroup, cbTransferPerSecMax);
-;
+
                     pBwGroup->cbTokensLast          = pBwGroup->cbBucketSize;
                     pBwGroup->tsUpdatedLast         = RTTimeSystemNanoTS();
@@ -183,4 +185,5 @@
 }
 
+
 static void pdmNsBwGroupTerminate(PPDMNSBWGROUP pBwGroup)
 {
@@ -196,4 +199,5 @@
 }
 
+
 DECLINLINE(void) pdmNsBwGroupUnref(PPDMNSBWGROUP pBwGroup)
 {
@@ -201,4 +205,5 @@
     ASMAtomicDecU32(&pBwGroup->cRefs);
 }
+
 
 static void pdmNsBwGroupXmitPending(PPDMNSBWGROUP pBwGroup)
@@ -235,4 +240,5 @@
 }
 
+
 static void pdmNsFilterLink(PPDMNSFILTER pFilter)
 {
@@ -245,4 +251,5 @@
     rc = PDMCritSectLeave(&pBwGroup->cs); AssertRC(rc);
 }
+
 
 static void pdmNsFilterUnlink(PPDMNSFILTER pFilter)
@@ -275,4 +282,5 @@
 }
 
+
 VMMR3DECL(int) PDMR3NsAttach(PVM pVM, PPDMDRVINS pDrvIns, const char *pcszBwGroup,
                              PPDMNSFILTER pFilter)
@@ -314,4 +322,5 @@
     return rc;
 }
+
 
 VMMR3DECL(int) PDMR3NsDetach(PVM pVM, PPDMDRVINS pDrvIns, PPDMNSFILTER pFilter)
@@ -337,8 +346,10 @@
 }
 
+
 VMMR3DECL(bool) PDMR3NsAllocateBandwidth(PPDMNSFILTER pFilter, size_t cbTransfer)
 {
     return pdmNsAllocateBandwidth(pFilter, cbTransfer);
 }
+
 
 VMMR3DECL(int) PDMR3NsBwGroupSetLimit(PVM pVM, const char *pcszBwGroup, uint64_t cbTransferPerSecMax)
@@ -393,4 +404,5 @@
 }
 
+
 /**
  * @copydoc FNPDMTHREADWAKEUPINT
@@ -403,4 +415,5 @@
     return VINF_SUCCESS;
 }
+
 
 /**
@@ -433,4 +446,5 @@
 }
 
+
 /**
  * Initialize the network shaper.
@@ -494,11 +508,10 @@
             {
                 PUVM pUVM = pVM->pUVM;
-                AssertMsg(!pUVM->pdm.s.pNetShaper,
-                          ("Network shaper was already initialized\n"));
-
-                char szDesc[256];
-                static unsigned iThread;
-
-                RTStrPrintf(szDesc, sizeof(szDesc), "PDMNSTXThread-%d", ++iThread);
+                AssertMsg(!pUVM->pdm.s.pNetShaper, ("Network shaper was already initialized\n"));
+
+                char szDesc[64];
+                static unsigned s_iThread;
+
+                RTStrPrintf(szDesc, sizeof(szDesc), "PDMNsTx-%d", ++s_iThread);
                 rc = PDMR3ThreadCreate(pVM, &pNetShaper->hTxThread, pNetShaper,
                                        pdmR3NsTxThread, pdmR3NsTxWakeUp, 0,