Changeset 26595 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Feb 17, 2010 2:42:20 AM (15 years ago)

Author:

vboxsync

Message:

CPU hotplug: Fix guest cpu hot-plug monitor. The paths have changed

File:

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

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

@@ -65 +65 @@
 
     PRTDIR pDirDevices = NULL;
-    int rc = RTDirOpen(&pDirDevices, SYSFS_ACPI_CPU_PATH);  /*could use RTDirOpenFiltered*/
+    int rc = RTDirOpen(&pDirDevices, SYSFS_ACPI_CPU_PATH);  /* could use RTDirOpenFiltered */
     if (RT_SUCCESS(rc))
     {
-        RTDIRENTRY DirFolderContent;
-        while (RT_SUCCESS(RTDirRead(pDirDevices, &DirFolderContent, NULL))) /* Assumption that szName has always enough space */
-        {
-            if (!strncmp(DirFolderContent.szName, "LNXCPU", 6))
+        /* Search every ACPI0004 container device for LNXCPU devices. */
+        RTDIRENTRY DirFolderAcpiContainer;
+        bool fFound = false;
+
+        while (   RT_SUCCESS(RTDirRead(pDirDevices, &DirFolderAcpiContainer, NULL))
+               && !fFound) /* Assumption that szName has always enough space */
+        {
+            if (!strncmp(DirFolderAcpiContainer.szName, "ACPI0004", 8))
             {
-                /* Get the sysdev */
-                uint32_t idCore    = RTLinuxSysFsReadIntFile(10, "%s/%s/sysdev/topology/core_id",
-                                                             SYSFS_ACPI_CPU_PATH, DirFolderContent.szName);
-                uint32_t idPackage = RTLinuxSysFsReadIntFile(10, "%s/%s/sysdev/topology/physical_package_id",
-                                                             SYSFS_ACPI_CPU_PATH, DirFolderContent.szName);
-                if (   idCore    == idCpuCore
-                    && idPackage == idCpuPackage)
+                char *pszAcpiContainerPath = NULL;
+                PRTDIR pDirAcpiContainer = NULL;
+
+                rc = RTStrAPrintf(&pszAcpiContainerPath, "%s/%s", SYSFS_ACPI_CPU_PATH, DirFolderAcpiContainer.szName);
+                if (RT_FAILURE(rc))
+                    break;
+
+                rc = RTDirOpen(&pDirAcpiContainer, pszAcpiContainerPath);
+                if (RT_SUCCESS(rc))
                 {
-                    /* Return the path */
-                    rc = RTStrAPrintf(ppszPath, "%s/%s", SYSFS_ACPI_CPU_PATH, DirFolderContent.szName);
-                    break;
+                    RTDIRENTRY DirFolderContent;
+                    while (RT_SUCCESS(RTDirRead(pDirAcpiContainer, &DirFolderContent, NULL))) /* Assumption that szName has always enough space */
+                    {
+                        if (!strncmp(DirFolderContent.szName, "LNXCPU", 6))
+                        {
+                            /* Get the sysdev */
+                            uint32_t idCore    = RTLinuxSysFsReadIntFile(10, "%s/%s/sysdev/topology/core_id",
+                                                                         pszAcpiContainerPath, DirFolderContent.szName);
+                            uint32_t idPackage = RTLinuxSysFsReadIntFile(10, "%s/%s/sysdev/topology/physical_package_id",
+                                                                         pszAcpiContainerPath, DirFolderContent.szName);
+                            if (   idCore    == idCpuCore
+                                && idPackage == idCpuPackage)
+                            {
+                                /* Return the path */
+                                rc = RTStrAPrintf(ppszPath, "%s/%s", pszAcpiContainerPath, DirFolderContent.szName);
+                                fFound = true;
+                                break;
+                            }
+                        }
+                    }
+
+                    RTDirClose(pDirAcpiContainer);
                 }
+
+                RTStrFree(pszAcpiContainerPath);
             }
         }
@@ -139 +166 @@
         {
 /** @todo r-bird: This code is bringing all CPUs online; the idCpuCore and
- *        idCpuPackage parameters are unused!   */
+ *        idCpuPackage parameters are unused!   
+ *        aeichner: These files are not available at this point unfortunately. (see comment above) 
+ */
             /*
              * Check if this is a CPU object.