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

Timestamp:

Sep 16, 2008 1:04:14 PM (16 years ago)

Author:

vboxsync

Message:

multiple LAPICs intermediate commit

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -431 +431 @@
         {
             ComPtr<IHostFloppyDrive> hostFloppyDrive;
-            hrc = floppyDrive->GetHostDrive(hostFloppyDrive.asOutParam());              H();
+            hrc = floppyDrive->GetHostDrive(hostFloppyDrive.asOutParam());                  H();
             if (hostFloppyDrive)
             {
@@ -500 +500 @@
      * Advanced Programmable Interrupt Controller.
      */
+#ifdef VBOX_WITH_SMP_GUESTS
+    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();
@@ -505 +519 @@
     rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                               RC_CHECK();
     rc = CFGMR3InsertInteger(pCfg,  "IOAPIC", fIOAPIC);                             RC_CHECK();
+#endif
 
     if (fIOAPIC)