Index: /trunk/src/VBox/Main/ConsoleImpl2.cpp
===================================================================
--- /trunk/src/VBox/Main/ConsoleImpl2.cpp	(revision 12429)
+++ /trunk/src/VBox/Main/ConsoleImpl2.cpp	(revision 12430)
@@ -17,5 +17,5 @@
  * Foundation, in version 2 as it comes in the "COPYING" file of the
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * hope that it will be useful, but WITHOUT ANY WARRAN  TY of any kind.
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
@@ -135,8 +135,8 @@
 
 #ifdef VBOX_WITH_SMP_GUESTS
-    /* @todo: r=nike: Testing code, should use actual getter when ready */
-    uint16_t cNumCpus = 2;
+    /* @todo nike: Testing code, should use actual getter when ready */
+    uint16_t cCpus = 2;
 #else
-    uint16_t cNumCpus = 1;
+    uint16_t cCpus = 1;
 #endif
 
@@ -157,5 +157,5 @@
     rc = CFGMR3InsertBytes(pRoot,   "UUID", pUuid, sizeof(*pUuid));                 RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RamSize",              cRamMBs * _1M);         RC_CHECK();
-    rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cNumCpus);              RC_CHECK();
+    rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
@@ -279,5 +279,5 @@
     rc = CFGMR3InsertNode(pInst,    "Config", &pBiosCfg);                           RC_CHECK();
     rc = CFGMR3InsertInteger(pBiosCfg,  "RamSize",              cRamMBs * _1M);     RC_CHECK();
-    rc = CFGMR3InsertInteger(pBiosCfg,  "NumCPUs",              cNumCpus);          RC_CHECK();
+    rc = CFGMR3InsertInteger(pBiosCfg,  "NumCPUs",              cCpus);             RC_CHECK();
     rc = CFGMR3InsertString(pBiosCfg,   "HardDiskDevice",       "piix3ide");        RC_CHECK();
     rc = CFGMR3InsertString(pBiosCfg,   "FloppyDevice",         "i82078");          RC_CHECK();
@@ -465,5 +465,5 @@
         rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                           RC_CHECK();
         rc = CFGMR3InsertInteger(pCfg,  "RamSize",          cRamMBs * _1M);         RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cNumCpus);              RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "NumCPUs",          cCpus);                 RC_CHECK();
 
         rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
@@ -1204,6 +1204,6 @@
 
 #elif defined(VBOX_WITH_NETFLT) && !defined(RT_OS_WINDOWS) /** @todo merge in the windows stuff too */
-                    /* 
-                     * This is the new VBoxNetFlt+IntNet stuff. 
+                    /*
+                     * This is the new VBoxNetFlt+IntNet stuff.
                      */
                     if (fSniffer)
@@ -1236,10 +1236,10 @@
                     const char *pszTrunk = szTrunk;
 
-# elif defined(RT_OS_SOLARIS) 
+# elif defined(RT_OS_SOLARIS)
                     /* The name is on the form format 'ifX - long name, chop it off at space. */
                     char szTrunk[8];
                     strncpy(szTrunk, pszHifName, sizeof(szTrunk));
                     char *pszSpace = (char *)memchr(szTrunk, ' ', sizeof(szTrunk));
-                    
+
                     /*
                      * Currently don't bother about malformed names here for the sake of people using
@@ -1250,5 +1250,5 @@
                         *pszSpace = '\0';
                     const char *pszTrunk = szTrunk;
-# else 
+# else
 #  error "PORTME (VBOX_WITH_NETFLT)"
 # endif
@@ -1269,5 +1269,5 @@
                         rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true);    RC_CHECK();
                     }
-# else 
+# else
                     /** @todo PORTME: wireless detection */
 # endif