External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

nodeinfo: Fix nodeGetCPUBitmap()'s fallback code path

Browse Source 
During the recent refactoring/cleanups, a bug has been introduced
that caused all CPUs to be reported as online unless the sysfs
cpu/present file was available.

This commit fixes the fallback code path by building the directory
path passed to virNodeGetCpuValue() correctly.
This commit is contained in:
Andrea Bolognani 2015-07-17 18:12:50 +02:00 committed by Peter Krempa
parent c30ae1864f
commit 2a6801892a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nodeinfo.c
View File

@ -1301,6 +1301,7 @@ nodeGetCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED,
#ifdef __linux__ #ifdef __linux__
const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH; const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
char *online_path = NULL; char *online_path = NULL;
char *cpudir = NULL;
virBitmapPtr cpumap; virBitmapPtr cpumap;
int present; int present;
@ -1318,8 +1319,12 @@ nodeGetCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED,
cpumap = virBitmapNew(present); cpumap = virBitmapNew(present);
if (!cpumap) if (!cpumap)
goto cleanup; goto cleanup;
if (virAsprintf(&cpudir, "%s/cpu", prefix) < 0)
goto cleanup;
for (i = 0; i < present; i++) { for (i = 0; i < present; i++) {
int online = virNodeGetCpuValue(prefix, i, "online", 1); int online = virNodeGetCpuValue(cpudir, i, "online", 1);
if (online < 0) { if (online < 0) {
virBitmapFree(cpumap); virBitmapFree(cpumap);
cpumap = NULL; cpumap = NULL;
@ -1333,6 +1338,7 @@ nodeGetCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED,
*max_id = present; *max_id = present;
cleanup: cleanup:
VIR_FREE(online_path); VIR_FREE(online_path);
VIR_FREE(cpudir);
return cpumap; return cpumap;
#else #else
virReportError(VIR_ERR_NO_SUPPORT, "%s", virReportError(VIR_ERR_NO_SUPPORT, "%s",