Changeset 12520 in vbox for trunk/src/VBox/Main/ConsoleImpl2.cpp

Timestamp:

Sep 16, 2008 10:32:54 PM (16 years ago)

Author:

vboxsync

Message:

ConsoleImpl2: Use CFGMR3InsertNodeF, drop the #ifdef as the code will work right in non-SMP enabled mode too (cCpus==1).

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -499 +499 @@
     /*
      * Advanced Programmable Interrupt Controller.
-     */
-#ifdef VBOX_WITH_SMP_GUESTS
+     * SMP: Each CPU has a LAPIC (cross-calls).
+     */
     rc = CFGMR3InsertNode(pDevices, "apic", &pDev);                                 RC_CHECK();
-    /* We need LAPIC per-CPU, as it allows cross-calls */
-    for (ULONG ulInstance = 0; ulInstance < cCpus; ulInstance++)
-    {
-        char szInstance[4]; Assert(ulInstance <= 999);
-        RTStrPrintf(szInstance, sizeof(szInstance), "%lu", ulInstance);
-        rc = CFGMR3InsertNode(pDev, szInstance, &pInst); 
-        RC_CHECK();
-        rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
-        rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
-        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                             RC_CHECK();
-    }
-#else
-    rc = CFGMR3InsertNode(pDevices, "apic", &pDev);                                 RC_CHECK();
-    rc = CFGMR3InsertNode(pDev,     "0", &pInst);                                   RC_CHECK();
-    rc = CFGMR3InsertInteger(pInst, "Trusted",              1);     /* boolean */   RC_CHECK();
-    rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
-    rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                             RC_CHECK();
-#endif
+    for (unsigned iCpu = 0; iCpu < cCpus; iCpu++)
+    {
+        rc = CFGMR3InsertNodeF(pDev, &pInst, "%u", iCpu);                           RC_CHECK();
+        rc = CFGMR3InsertInteger(pInst, "Trusted",          1);     /* boolean */   RC_CHECK();
+        rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                           RC_CHECK();
+        rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                         RC_CHECK();
+    }
 
     if (fIOAPIC)