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

Timestamp:

Jan 14, 2010 1:43:33 AM (15 years ago)

Author:

vboxsync

Message:

The CPU is always attached if CPU hotplugging is not enabled

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (1 diff)

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

@@ -2281 +2281 @@
     for (unsigned i = 1; i < s->cCpus; i++)
     {
-        PPDMIBASE IBaseTmp;
-        rc = PDMDevHlpDriverAttach(pDevIns, i, &s->IBase, &IBaseTmp, "ACPI CPU");
-
-        if (RT_SUCCESS(rc))
+        if (s->fCpuHotplug)
         {
+            PPDMIBASE IBaseTmp;
+            rc = PDMDevHlpDriverAttach(pDevIns, i, &s->IBase, &IBaseTmp, "ACPI CPU");
+
+            if (RT_SUCCESS(rc))
+            {
+                s->afCpuAttached[i] = true;
+                s->uCpusLocked |= RT_BIT(i);
+                Log(("acpi: Attached CPU %u\n", i));
+            }
+            else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
+            {
+                Log(("acpi: CPU %u not attached yet\n", i));
+                s->afCpuAttached[i] = false;
+            }
+            else
+                return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to attach CPU object\n"));
+        }
+        else
+        {
+            /* CPU is always attached if hotplug is not enabled. */
             s->afCpuAttached[i] = true;
             s->uCpusLocked |= RT_BIT(i);
-            Log(("acpi: Attached CPU %u\n", i));
         }
-        else if (rc == VERR_PDM_NO_ATTACHED_DRIVER)
-        {
-            Log(("acpi: CPU %u not attached yet\n", i));
-            s->afCpuAttached[i] = false;
-        }
-        else
-            return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to attach CPU object\n"));
     }