- Timestamp:
- Sep 12, 2008 3:20:01 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/ConsoleImpl2.cpp
r12428 r12430 17 17 * Foundation, in version 2 as it comes in the "COPYING" file of the 18 18 * VirtualBox OSE distribution. VirtualBox OSE is distributed in the 19 * hope that it will be useful, but WITHOUT ANY WARRAN TY of any kind.19 * hope that it will be useful, but WITHOUT ANY WARRAN TY of any kind. 20 20 * 21 21 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa … … 135 135 136 136 #ifdef VBOX_WITH_SMP_GUESTS 137 /* @todo : r=nike: Testing code, should use actual getter when ready */138 uint16_t c NumCpus = 2;137 /* @todo nike: Testing code, should use actual getter when ready */ 138 uint16_t cCpus = 2; 139 139 #else 140 uint16_t c NumCpus = 1;140 uint16_t cCpus = 1; 141 141 #endif 142 142 … … 157 157 rc = CFGMR3InsertBytes(pRoot, "UUID", pUuid, sizeof(*pUuid)); RC_CHECK(); 158 158 rc = CFGMR3InsertInteger(pRoot, "RamSize", cRamMBs * _1M); RC_CHECK(); 159 rc = CFGMR3InsertInteger(pRoot, "NumCPUs", c NumCpus);RC_CHECK();159 rc = CFGMR3InsertInteger(pRoot, "NumCPUs", cCpus); RC_CHECK(); 160 160 rc = CFGMR3InsertInteger(pRoot, "TimerMillies", 10); RC_CHECK(); 161 161 rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled", 1); /* boolean */ RC_CHECK(); … … 279 279 rc = CFGMR3InsertNode(pInst, "Config", &pBiosCfg); RC_CHECK(); 280 280 rc = CFGMR3InsertInteger(pBiosCfg, "RamSize", cRamMBs * _1M); RC_CHECK(); 281 rc = CFGMR3InsertInteger(pBiosCfg, "NumCPUs", c NumCpus);RC_CHECK();281 rc = CFGMR3InsertInteger(pBiosCfg, "NumCPUs", cCpus); RC_CHECK(); 282 282 rc = CFGMR3InsertString(pBiosCfg, "HardDiskDevice", "piix3ide"); RC_CHECK(); 283 283 rc = CFGMR3InsertString(pBiosCfg, "FloppyDevice", "i82078"); RC_CHECK(); … … 465 465 rc = CFGMR3InsertNode(pInst, "Config", &pCfg); RC_CHECK(); 466 466 rc = CFGMR3InsertInteger(pCfg, "RamSize", cRamMBs * _1M); RC_CHECK(); 467 rc = CFGMR3InsertInteger(pCfg, "NumCPUs", c NumCpus);RC_CHECK();467 rc = CFGMR3InsertInteger(pCfg, "NumCPUs", cCpus); RC_CHECK(); 468 468 469 469 rc = CFGMR3InsertInteger(pCfg, "IOAPIC", fIOAPIC); RC_CHECK(); … … 1204 1204 1205 1205 #elif defined(VBOX_WITH_NETFLT) && !defined(RT_OS_WINDOWS) /** @todo merge in the windows stuff too */ 1206 /* 1207 * This is the new VBoxNetFlt+IntNet stuff. 1206 /* 1207 * This is the new VBoxNetFlt+IntNet stuff. 1208 1208 */ 1209 1209 if (fSniffer) … … 1236 1236 const char *pszTrunk = szTrunk; 1237 1237 1238 # elif defined(RT_OS_SOLARIS) 1238 # elif defined(RT_OS_SOLARIS) 1239 1239 /* The name is on the form format 'ifX - long name, chop it off at space. */ 1240 1240 char szTrunk[8]; 1241 1241 strncpy(szTrunk, pszHifName, sizeof(szTrunk)); 1242 1242 char *pszSpace = (char *)memchr(szTrunk, ' ', sizeof(szTrunk)); 1243 1243 1244 1244 /* 1245 1245 * Currently don't bother about malformed names here for the sake of people using … … 1250 1250 *pszSpace = '\0'; 1251 1251 const char *pszTrunk = szTrunk; 1252 # else 1252 # else 1253 1253 # error "PORTME (VBOX_WITH_NETFLT)" 1254 1254 # endif … … 1269 1269 rc = CFGMR3InsertInteger(pCfg, "SharedMacOnWire", true); RC_CHECK(); 1270 1270 } 1271 # else 1271 # else 1272 1272 /** @todo PORTME: wireless detection */ 1273 1273 # endif
Note:
See TracChangeset
for help on using the changeset viewer.