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

Timestamp:

Sep 18, 2008 5:47:53 PM (16 years ago)

Author:

vboxsync

Message:

reworked APIC structures layout - hopefully not broken smth accidentally

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -499 +499 @@
     /*
      * Advanced Programmable Interrupt Controller.
-     * SMP: Each CPU has a LAPIC (cross-calls).
+     * SMP: Each CPU has a LAPIC, but we have a single device representing all LAPICs states,
+     *      thus only single insert
      */
     rc = CFGMR3InsertNode(pDevices, "apic", &pDev);                                 RC_CHECK();
-    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();
-    }
-
+    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();
+    rc = CFGMR3InsertInteger(pCfg,  "NumCPUs", cCpus);                              RC_CHECK();
+
+    /* SMP: @todo: IOAPIC may be required for SMP configs */
     if (fIOAPIC)
     {