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

Timestamp:

Jan 14, 2010 10:39:12 AM (15 years ago)

Author:

vboxsync

Message:

r=bird: hot-plug review and code style cleanup. check out the @todos

Location:

trunk/src/VBox/Devices/PC

Files:

• ACPI/VBoxAcpi.cpp (modified) (1 diff)
• DevACPI.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp

@@ -144 +144 @@
     unsigned char *pbAmlCode = NULL;
     size_t cbAmlCode = 0;
-    bool fCpuHotplug = false;
-    int rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "CpuHotplug", &fCpuHotplug, false);
+    bool fCpuHotPlug = false;
+    int rc = CFGMR3QueryBoolDef(pDevIns->pCfgHandle, "CpuHotplug", &fCpuHotPlug, false); /** @todo r=bird: Rename to CpuHotPlug. */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Failed to read \"CpuHotplug\""));
 
-    if (fCpuHotplug)
+    if (fCpuHotPlug)
     {
         pbAmlCode = AmlCodeCpuHotplug;

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

@@ -238 +238 @@
     uint32_t            cbMADT;
     /** Array of flags of attached CPUs */
-    bool                afCpuAttached[32]; /* Maximum we support atm */
+    bool                afCpuAttached[VMM_MAX_CPU_COUNT]; /**< @todo use VMCPUSET.  */
     /** Mask of locked CPUs (used by the guest) */
-    uint32_t            uCpusLocked;
-    /** Flag whether CPU hotplugging is enabled */
-    bool                fCpuHotplug;
+    uint32_t            uCpusLocked;                      /**< @todo use VMCPUSET. */
+    /** Flag whether CPU hot plugging is enabled */
+    bool                fCpuHotPlug;
     /** Aligning IBase. */
     bool                afAlignment[4];
@@ -731 +731 @@
 
     /* We have to force physical APIC mode or Linux can't use more than 8 CPUs */
-    if (s->fCpuHotplug)
+    if (s->fCpuHotPlug)
         fadt.u32Flags |= RT_H2LE_U32(FADT_FL_FORCE_APIC_PHYS_DEST_MODE);
 
@@ -2095 +2095 @@
         /*
          * Lock the CPU because we don't know if the guest will use it or not.
-         * Prevents ejection while the CPU is still used 
+         * Prevents ejection while the CPU is still used
          */
         s->uCpusLocked |= RT_BIT(iLUN);
@@ -2195 +2195 @@
                               "ShowRtc\0"
                               "ShowCpu\0"
-                              "CpuHotplug\0"
+                              "CpuHotplug\0" /** @todo r=bird: Rename to CpuHotPlug. */
                               ))
         return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
@@ -2242 +2242 @@
                                 N_("Configuration error: Failed to read \"ShowCpu\""));
 
-    /* query whether we are allow CPU hotplugging */
-    rc = CFGMR3QueryBoolDef(pCfgHandle, "CpuHotplug", &s->fCpuHotplug, false);
+    /* query whether we are allow CPU hot plugging */
+    rc = CFGMR3QueryBoolDef(pCfgHandle, "CpuHotplug", &s->fCpuHotPlug, false); /** @todo r=bird: Rename to CpuHotPlug. */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
@@ -2281 +2281 @@
     for (unsigned i = 1; i < s->cCpus; i++)
     {
-        if (s->fCpuHotplug)
+        if (s->fCpuHotPlug)
         {
             PPDMIBASE IBaseTmp;
@@ -2302 +2302 @@
         else
         {
-            /* CPU is always attached if hotplug is not enabled. */
+            /* CPU is always attached if hot-plug is not enabled. */
             s->afCpuAttached[i] = true;
             s->uCpusLocked |= RT_BIT(i);