Changeset 50286 in vbox

Timestamp:

Jan 30, 2014 1:34:02 PM (11 years ago)

Author:

vboxsync

Message:

VBoxService: Fix CPU hotunplug code for newer kernels where the \'sysdev\' directory was changed to \'physical_node\'

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp

@@ -120 +120 @@
     /** Level 4 */
     {ACPI_CPU_PATH_NOT_PROBED, g_aAcpiCpuPathLvl4, RT_ELEMENTS(g_aAcpiCpuPathLvl4), NULL, NULL},
+};
+
+/**
+ * Possible directories to get to the topology directory for reading core and package id.
+ *
+ * @remark: This is not part of the path above because the eject file is not in one of the directories
+ *          below and would make the hot unplug code fail.
+ */
+const char *g_apszTopologyPath[] =
+{
+    "sysdev",
+    "physical_node"
 };
 #endif
@@ -278 +290 @@
                     {
                         /* Get the sysdev */
-                        uint32_t idCore    = RTLinuxSysFsReadIntFile(10, "%s/sysdev/topology/core_id",
-                                                                     pszPathCurr);
-                        uint32_t idPackage = RTLinuxSysFsReadIntFile(10, "%s/sysdev/topology/physical_package_id",
-                                                                     pszPathCurr);
+                        uint32_t idCore = 0;
+                        uint32_t idPackage = 0;
+
+                        for (unsigned i = 0; i < RT_ELEMENTS(g_apszTopologyPath); i++)
+                        {
+                            int64_t i64Core    = RTLinuxSysFsReadIntFile(10, "%s/%s/topology/core_id",
+                                                                         pszPathCurr, g_apszTopologyPath[i]);
+                            int64_t i64Package = RTLinuxSysFsReadIntFile(10, "%s/%s/topology/physical_package_id",
+                                                                         pszPathCurr, g_apszTopologyPath[i]);
+
+                            if (   i64Core != -1
+                                && i64Package != -1)
+                            {
+                                idCore = (uint32_t)i64Core;
+                                idPackage = (uint32_t)i64Package;
+                                break;
+                            }
+                        }
+
                         if (   idCore    == idCpuCore
                             && idPackage == idCpuPackage)