diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 441f94242adf8e7614c2c53eec6f9ec492adf580..ff322d61083e5798eccae92f6aa922c0cb66e42d 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1000,7 +1000,6 @@ virLockManagerRelease; nodeAllocPages; nodeCapsInitNUMA; nodeGetCellsFreeMemory; -nodeGetCPUBitmap; nodeGetCPUCount; nodeGetCPUMap; nodeGetCPUStats; @@ -1009,6 +1008,7 @@ nodeGetInfo; nodeGetMemory; nodeGetMemoryParameters; nodeGetMemoryStats; +nodeGetOnlineCPUBitmap; nodeGetPresentCPUBitmap; nodeSetMemoryParameters; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index e98cda983b96be11d2cb8ede7164715681339ee8..779edeca1ec13c2c9a20f1ae27195245c3930ef8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1325,7 +1325,7 @@ nodeGetPresentCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED) } virBitmapPtr -nodeGetCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED) +nodeGetOnlineCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED) { #ifdef __linux__ const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH; @@ -1370,7 +1370,7 @@ nodeGetCPUBitmap(const char *sysfs_prefix ATTRIBUTE_UNUSED) return cpumap; #else virReportError(VIR_ERR_NO_SUPPORT, "%s", - _("node cpumap not implemented on this platform")); + _("node online CPU map not implemented on this platform")); return NULL; #endif } @@ -1692,7 +1692,7 @@ nodeGetCPUMap(const char *sysfs_prefix, if (!cpumap && !online) return nodeGetCPUCount(sysfs_prefix); - if (!(cpus = nodeGetCPUBitmap(sysfs_prefix))) + if (!(cpus = nodeGetOnlineCPUBitmap(sysfs_prefix))) goto cleanup; if (cpumap && virBitmapToData(cpus, cpumap, &dummy) < 0) diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 02af9c5c5585c675388bf309160f622c84e5488d..1810c1cf368ff5e4bf0cc7fb5176f8d1ef54068a 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -45,7 +45,7 @@ int nodeGetMemory(unsigned long long *mem, unsigned long long *freeMem); virBitmapPtr nodeGetPresentCPUBitmap(const char *sysfs_prefix); -virBitmapPtr nodeGetCPUBitmap(const char *sysfs_prefix); +virBitmapPtr nodeGetOnlineCPUBitmap(const char *sysfs_prefix); int nodeGetCPUCount(const char *sysfs_prefix); int nodeGetMemoryParameters(virTypedParameterPtr params,