Changeset 36024 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Feb 21, 2011 9:07:19 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70125

Message:

IOAPIC: assign ID matching MADT

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -2818 +2818 @@
     bool         fR0Enabled;
     int          rc;
+    uint32_t     cCpus;
 
     Assert(iInstance == 0);
@@ -2824 +2825 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfg, "GCEnabled\0" "R0Enabled\0"))
+    if (!CFGMR3AreValuesValid(pCfg,
+                              "GCEnabled\0"
+                              "R0Enabled\0"
+                              "NumCPUs\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
 
@@ -2836 +2840 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to query boolean value \"R0Enabled\""));
+
+    rc = CFGMR3QueryU32Def(pCfg, "NumCPUs", &cCpus, 1);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to query integer value \"NumCPUs\""));
+
     Log(("IOAPIC: fR0Enabled=%RTbool fGCEnabled=%RTbool\n", fR0Enabled, fGCEnabled));
 
@@ -2846 +2856 @@
     s->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
     ioapic_reset(s);
-    s->id = 0;
+    s->id = cCpus;
 
     /*