10:22 a.m.
In preparation for moving all the CPU related APIs out of
the nodeinfo file, give them a virHostCPU name prefix.
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
src/libvirt_linux.syms | 6 +-
src/libvirt_private.syms | 12 +--
src/lxc/lxc_controller.c | 2 +-
src/lxc/lxc_driver.c | 4 +-
src/nodeinfo.c | 212 ++++++++++++++++++++++-----------------------
src/nodeinfo.h | 22 ++---
src/nodeinfopriv.h | 26 +++---
src/openvz/openvz_driver.c | 4 +-
src/qemu/qemu_driver.c | 10 +--
src/qemu/qemu_process.c | 2 +-
src/uml/uml_driver.c | 4 +-
src/util/vircgroup.c | 2 +-
tests/nodeinfomock.c | 2 +-
tests/nodeinfotest.c | 20 ++---
tests/vircgrouptest.c | 4 +-
15 files changed, 166 insertions(+), 166 deletions(-)
diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
index f569a23..a2fc076 100644
--- a/src/libvirt_linux.syms
+++ b/src/libvirt_linux.syms
@@ -3,9 +3,9 @@
#
# nodeinfo.h
-linuxNodeGetCPUStats;
-linuxNodeInfoCPUPopulate;
-linuxNodeInfoSetSysFSSystemPath;
+virHostCPUGetInfoPopulateLinux;
+virHostCPUGetStatsLinux;
+virHostCPUSetSysFSSystemPathLinux;
# Let emacs know we want case-insensitive sorting
# Local Variables:
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 2317c25..22b81ae 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1026,13 +1026,13 @@ virLogManagerNew;
# nodeinfo.h
nodeCapsInitNUMA;
-nodeGetCPUCount;
-nodeGetCPUMap;
-nodeGetCPUStats;
nodeGetInfo;
-nodeGetOnlineCPUBitmap;
-nodeGetPresentCPUBitmap;
-nodeGetThreadsPerSubcore;
+virHostCPUGetCount;
+virHostCPUGetMap;
+virHostCPUGetOnlineBitmap;
+virHostCPUGetPresentBitmap;
+virHostCPUGetStats;
+virHostCPUGetThreadsPerSubcore;
virHostMemAllocPages;
virHostMemGetCellsFree;
virHostMemGetFreePages;
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index a566c12..45ad25e 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -723,7 +723,7 @@ static int virLXCControllerSetupCpuAffinity(virLXCControllerPtr ctrl)
/* setaffinity fails if you set bits for CPUs which
* aren't present, so we have to limit ourselves */
- if ((hostcpus = nodeGetCPUCount()) < 0)
+ if ((hostcpus = virHostCPUGetCount()) < 0)
return -1;
if (maxcpu > hostcpus)
diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 3a8383b..c5e9a5f 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -5440,7 +5440,7 @@ lxcNodeGetCPUStats(virConnectPtr conn,
if (virNodeGetCPUStatsEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUStats(cpuNum, params, nparams, flags);
+ return virHostCPUGetStats(cpuNum, params, nparams, flags);
}
@@ -5521,7 +5521,7 @@ lxcNodeGetCPUMap(virConnectPtr conn,
if (virNodeGetCPUMapEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUMap(cpumap, online, flags);
+ return virHostCPUGetMap(cpumap, online, flags);
}
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 1cac1a4..a3d0024 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -68,7 +68,7 @@ VIR_LOG_INIT("nodeinfo");
#if defined(__FreeBSD__) || defined(__APPLE__)
static int
-appleFreebsdNodeGetCPUCount(void)
+virHostCPUGetCountAppleFreeBSD(void)
{
int ncpu_mib[2] = { CTL_HW, HW_NCPU };
unsigned long ncpu;
@@ -90,9 +90,9 @@ appleFreebsdNodeGetCPUCount(void)
# define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / (stathz ? stathz : hz))
static int
-freebsdNodeGetCPUStats(int cpuNum,
- virNodeCPUStatsPtr params,
- int *nparams)
+virHostCPUGetStatsFreebsd(int cpuNum,
+ virNodeCPUStatsPtr params,
+ int *nparams)
{
const char *sysctl_name;
long *cpu_times;
@@ -139,7 +139,7 @@ freebsdNodeGetCPUStats(int cpuNum,
offset = 0;
} else {
sysctl_name = "kern.cp_times";
- cpu_times_num = appleFreebsdNodeGetCPUCount();
+ cpu_times_num = virHostCPUGetCountAppleFreeBSD();
if (cpuNum >= cpu_times_num) {
virReportInvalidArg(cpuNum,
@@ -275,7 +275,7 @@ virHostMemGetStatsFreeBSD(virNodeMemoryStatsPtr params,
static const char *sysfs_system_path = SYSFS_SYSTEM_PATH;
-void linuxNodeInfoSetSysFSSystemPath(const char *path)
+void virHostCPUSetSysFSSystemPathLinux(const char *path)
{
if (path)
sysfs_system_path = path;
@@ -330,7 +330,7 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char
*file,
}
static unsigned long
-virNodeCountThreadSiblings(const char *dir, unsigned int cpu)
+virHostCPUCountThreadSiblings(const char *dir, unsigned int cpu)
{
unsigned long ret = 0;
char *path;
@@ -363,9 +363,9 @@ virNodeCountThreadSiblings(const char *dir, unsigned int cpu)
}
static int
-virNodeParseSocket(const char *dir,
- virArch arch,
- unsigned int cpu)
+virHostCPUParseSocket(const char *dir,
+ virArch arch,
+ unsigned int cpu)
{
int ret = virNodeGetCpuValue(dir, cpu, "topology/physical_package_id", 0);
@@ -385,15 +385,15 @@ ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(6)
ATTRIBUTE_NONNULL(7) ATTRIBUTE_NONNULL(8)
ATTRIBUTE_NONNULL(9)
-virNodeParseNode(const char *node,
- virArch arch,
- virBitmapPtr present_cpus_map,
- virBitmapPtr online_cpus_map,
- int threads_per_subcore,
- int *sockets,
- int *cores,
- int *threads,
- int *offline)
+virHostCPUParseNode(const char *node,
+ virArch arch,
+ virBitmapPtr present_cpus_map,
+ virBitmapPtr online_cpus_map,
+ int threads_per_subcore,
+ int *sockets,
+ int *cores,
+ int *threads,
+ int *offline)
{
/* Biggest value we can expect to be used as either socket id
* or core id. Bitmaps will need to be sized accordingly */
@@ -446,7 +446,7 @@ virNodeParseNode(const char *node,
continue;
/* Parse socket */
- if ((sock = virNodeParseSocket(node, arch, cpu)) < 0)
+ if ((sock = virHostCPUParseSocket(node, arch, cpu)) < 0)
goto cleanup;
if (sock > ID_MAX) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -501,7 +501,7 @@ virNodeParseNode(const char *node,
processors++;
/* Parse socket */
- if ((sock = virNodeParseSocket(node, arch, cpu)) < 0)
+ if ((sock = virHostCPUParseSocket(node, arch, cpu)) < 0)
goto cleanup;
if (!virBitmapIsBitSet(sockets_map, sock)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -528,7 +528,7 @@ virNodeParseNode(const char *node,
if (virBitmapSetBit(cores_maps[sock], core) < 0)
goto cleanup;
- if (!(siblings = virNodeCountThreadSiblings(node, cpu)))
+ if (!(siblings = virHostCPUCountThreadSiblings(node, cpu)))
goto cleanup;
if (siblings > *threads)
@@ -576,7 +576,7 @@ virNodeParseNode(const char *node,
* A valid configuration is one where no secondary thread is online;
* the primary thread in a subcore is always the first one */
static bool
-nodeHasValidSubcoreConfiguration(int threads_per_subcore)
+virHostCPUHasValidSubcoreConfiguration(int threads_per_subcore)
{
virBitmapPtr online_cpus = NULL;
int cpu = -1;
@@ -586,7 +586,7 @@ nodeHasValidSubcoreConfiguration(int threads_per_subcore)
if (threads_per_subcore <= 0)
goto cleanup;
- if (!(online_cpus = nodeGetOnlineCPUBitmap()))
+ if (!(online_cpus = virHostCPUGetOnlineBitmap()))
goto cleanup;
while ((cpu = virBitmapNextSetBit(online_cpus, cpu)) >= 0) {
@@ -606,14 +606,14 @@ nodeHasValidSubcoreConfiguration(int threads_per_subcore)
}
int
-linuxNodeInfoCPUPopulate(FILE *cpuinfo,
- virArch arch,
- unsigned int *cpus,
- unsigned int *mhz,
- unsigned int *nodes,
- unsigned int *sockets,
- unsigned int *cores,
- unsigned int *threads)
+virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
+ virArch arch,
+ unsigned int *cpus,
+ unsigned int *mhz,
+ unsigned int *nodes,
+ unsigned int *sockets,
+ unsigned int *cores,
+ unsigned int *threads)
{
virBitmapPtr present_cpus_map = NULL;
virBitmapPtr online_cpus_map = NULL;
@@ -713,10 +713,10 @@ linuxNodeInfoCPUPopulate(FILE *cpuinfo,
/* Get information about what CPUs are present in the host and what
* CPUs are online, so that we don't have to so for each node */
- present_cpus_map = nodeGetPresentCPUBitmap();
+ present_cpus_map = virHostCPUGetPresentBitmap();
if (!present_cpus_map)
goto cleanup;
- online_cpus_map = nodeGetOnlineCPUBitmap();
+ online_cpus_map = virHostCPUGetOnlineBitmap();
if (!online_cpus_map)
goto cleanup;
@@ -753,12 +753,12 @@ linuxNodeInfoCPUPopulate(FILE *cpuinfo,
* offline/online randomly.
* On hosts other than POWER this will be 0, in which case a simpler
* thread-counting logic will be used */
- if ((threads_per_subcore = nodeGetThreadsPerSubcore(arch)) < 0)
+ if ((threads_per_subcore = virHostCPUGetThreadsPerSubcore(arch)) < 0)
goto cleanup;
/* If the subcore configuration is not valid, just pretend subcores
* are not in use and count threads one by one */
- if (!nodeHasValidSubcoreConfiguration(threads_per_subcore))
+ if (!virHostCPUHasValidSubcoreConfiguration(threads_per_subcore))
threads_per_subcore = 0;
while ((direrr = virDirRead(nodedir, &nodedirent, sysfs_nodedir)) > 0) {
@@ -771,12 +771,12 @@ linuxNodeInfoCPUPopulate(FILE *cpuinfo,
sysfs_system_path, nodedirent->d_name) < 0)
goto cleanup;
- if ((nodecpus = virNodeParseNode(sysfs_cpudir, arch,
- present_cpus_map,
- online_cpus_map,
- threads_per_subcore,
- &nodesockets, &nodecores,
- &nodethreads, &offline)) < 0)
+ if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch,
+ present_cpus_map,
+ online_cpus_map,
+ threads_per_subcore,
+ &nodesockets, &nodecores,
+ &nodethreads, &offline)) < 0)
goto cleanup;
VIR_FREE(sysfs_cpudir);
@@ -805,12 +805,12 @@ linuxNodeInfoCPUPopulate(FILE *cpuinfo,
if (virAsprintf(&sysfs_cpudir, "%s/cpu", sysfs_system_path) < 0)
goto cleanup;
- if ((nodecpus = virNodeParseNode(sysfs_cpudir, arch,
- present_cpus_map,
- online_cpus_map,
- threads_per_subcore,
- &nodesockets, &nodecores,
- &nodethreads, &offline)) < 0)
+ if ((nodecpus = virHostCPUParseNode(sysfs_cpudir, arch,
+ present_cpus_map,
+ online_cpus_map,
+ threads_per_subcore,
+ &nodesockets, &nodecores,
+ &nodethreads, &offline)) < 0)
goto cleanup;
*nodes = 1;
@@ -870,7 +870,7 @@ linuxNodeInfoCPUPopulate(FILE *cpuinfo,
}
static int
-virNodeCPUStatsAssign(virNodeCPUStatsPtr param,
+virHostCPUStatsAssign(virNodeCPUStatsPtr param,
const char *name,
unsigned long long value)
{
@@ -887,10 +887,10 @@ virNodeCPUStatsAssign(virNodeCPUStatsPtr param,
# define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK))
int
-linuxNodeGetCPUStats(FILE *procstat,
- int cpuNum,
- virNodeCPUStatsPtr params,
- int *nparams)
+virHostCPUGetStatsLinux(FILE *procstat,
+ int cpuNum,
+ virNodeCPUStatsPtr params,
+ int *nparams)
{
int ret = -1;
char line[1024];
@@ -930,19 +930,19 @@ linuxNodeGetCPUStats(FILE *procstat,
continue;
}
- if (virNodeCPUStatsAssign(¶ms[0], VIR_NODE_CPU_STATS_KERNEL,
+ if (virHostCPUStatsAssign(¶ms[0], VIR_NODE_CPU_STATS_KERNEL,
(sys + irq + softirq) * TICK_TO_NSEC) < 0)
goto cleanup;
- if (virNodeCPUStatsAssign(¶ms[1], VIR_NODE_CPU_STATS_USER,
+ if (virHostCPUStatsAssign(¶ms[1], VIR_NODE_CPU_STATS_USER,
(usr + ni) * TICK_TO_NSEC) < 0)
goto cleanup;
- if (virNodeCPUStatsAssign(¶ms[2], VIR_NODE_CPU_STATS_IDLE,
+ if (virHostCPUStatsAssign(¶ms[2], VIR_NODE_CPU_STATS_IDLE,
idle * TICK_TO_NSEC) < 0)
goto cleanup;
- if (virNodeCPUStatsAssign(¶ms[3], VIR_NODE_CPU_STATS_IOWAIT,
+ if (virHostCPUStatsAssign(¶ms[3], VIR_NODE_CPU_STATS_IOWAIT,
iowait * TICK_TO_NSEC) < 0)
goto cleanup;
@@ -1066,7 +1066,7 @@ virHostMemGetStatsLinux(FILE *meminfo,
}
static char *
-linuxGetCPUGlobalPath(const char *file)
+virHostCPUGetGlobalPathLinux(const char *file)
{
char *path = NULL;
@@ -1077,21 +1077,21 @@ linuxGetCPUGlobalPath(const char *file)
}
static char *
-linuxGetCPUPresentPath(void)
+virHostCPUGetPresentPathLinux(void)
{
- return linuxGetCPUGlobalPath("present");
+ return virHostCPUGetGlobalPathLinux("present");
}
static char *
-linuxGetCPUOnlinePath(void)
+virHostCPUGetOnlinePathLinux(void)
{
- return linuxGetCPUGlobalPath("online");
+ return virHostCPUGetGlobalPathLinux("online");
}
/* Determine the number of CPUs (maximum CPU id + 1) from a file containing
* a list of CPU ids, like the Linux sysfs cpu/present file */
static int
-linuxParseCPUCount(const char *path)
+virHostCPUParseCountLinux(const char *path)
{
char *str = NULL;
char *tmp;
@@ -1123,7 +1123,7 @@ linuxParseCPUCount(const char *path)
* 0-4,6-7. This function parses it and returns cpumap.
*/
static virBitmapPtr
-linuxParseCPUmap(int max_cpuid, const char *path)
+virHostCPUParseMapLinux(int max_cpuid, const char *path)
{
virBitmapPtr map = NULL;
char *str = NULL;
@@ -1145,7 +1145,7 @@ linuxParseCPUmap(int max_cpuid, const char *path)
static virBitmapPtr
-virNodeGetSiblingsList(const char *dir, int cpu_id)
+virNodeGetSiblingsListLinux(const char *dir, int cpu_id)
{
char *path = NULL;
char *buf = NULL;
@@ -1170,13 +1170,13 @@ virNodeGetSiblingsList(const char *dir, int cpu_id)
static int
-nodeGetCPUInfo(virArch hostarch,
- unsigned int *cpus,
- unsigned int *mhz,
- unsigned int *nodes,
- unsigned int *sockets,
- unsigned int *cores,
- unsigned int *threads)
+virHostCPUGetInfo(virArch hostarch,
+ unsigned int *cpus,
+ unsigned int *mhz,
+ unsigned int *nodes,
+ unsigned int *sockets,
+ unsigned int *cores,
+ unsigned int *threads)
{
#ifdef __linux__
int ret = -1;
@@ -1188,9 +1188,9 @@ nodeGetCPUInfo(virArch hostarch,
return -1;
}
- ret = linuxNodeInfoCPUPopulate(cpuinfo, hostarch,
- cpus, mhz, nodes,
- sockets, cores, threads);
+ ret = virHostCPUGetInfoPopulateLinux(cpuinfo, hostarch,
+ cpus, mhz, nodes,
+ sockets, cores, threads);
if (ret < 0)
goto cleanup;
@@ -1201,7 +1201,7 @@ nodeGetCPUInfo(virArch hostarch,
unsigned long cpu_freq;
size_t cpu_freq_len = sizeof(cpu_freq);
- *cpus = appleFreebsdNodeGetCPUCount();
+ *cpus = virHostCPUGetCountAppleFreeBSD();
if (*cpus == -1)
return -1;
@@ -1251,20 +1251,20 @@ nodeGetInfo(virNodeInfoPtr nodeinfo)
return -1;
nodeinfo->memory = memorybytes / 1024;
- if (nodeGetCPUInfo(hostarch,
- &nodeinfo->cpus, &nodeinfo->mhz,
- &nodeinfo->nodes, &nodeinfo->sockets,
- &nodeinfo->cores, &nodeinfo->threads) < 0)
+ if (virHostCPUGetInfo(hostarch,
+ &nodeinfo->cpus, &nodeinfo->mhz,
+ &nodeinfo->nodes, &nodeinfo->sockets,
+ &nodeinfo->cores, &nodeinfo->threads) < 0)
return -1;
return 0;
}
int
-nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
- virNodeCPUStatsPtr params ATTRIBUTE_UNUSED,
- int *nparams ATTRIBUTE_UNUSED,
- unsigned int flags)
+virHostCPUGetStats(int cpuNum ATTRIBUTE_UNUSED,
+ virNodeCPUStatsPtr params ATTRIBUTE_UNUSED,
+ int *nparams ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
virCheckFlags(0, -1);
@@ -1277,13 +1277,13 @@ nodeGetCPUStats(int cpuNum ATTRIBUTE_UNUSED,
_("cannot open %s"), PROCSTAT_PATH);
return -1;
}
- ret = linuxNodeGetCPUStats(procstat, cpuNum, params, nparams);
+ ret = virHostCPUGetStatsLinux(procstat, cpuNum, params, nparams);
VIR_FORCE_FCLOSE(procstat);
return ret;
}
#elif defined(__FreeBSD__)
- return freebsdNodeGetCPUStats(cpuNum, params, nparams);
+ return virHostCPUGetStatsFreeBSD(cpuNum, params, nparams);
#else
virReportError(VIR_ERR_NO_SUPPORT, "%s",
_("node CPU stats not implemented on this platform"));
@@ -1349,7 +1349,7 @@ virHostMemGetStats(int cellNum ATTRIBUTE_UNUSED,
}
int
-nodeGetCPUCount(void)
+virHostCPUGetCount(void)
{
#if defined(__linux__)
/* To support older kernels that lack cpu/present, such as 2.6.18
@@ -1361,11 +1361,11 @@ nodeGetCPUCount(void)
char *cpupath = NULL;
int ncpu = -1;
- if (!(present_path = linuxGetCPUPresentPath()))
+ if (!(present_path = virHostCPUGetPresentPathLinux()))
return -1;
if (virFileExists(present_path)) {
- ncpu = linuxParseCPUCount(present_path);
+ ncpu = virHostCPUParseCountLinux(present_path);
goto cleanup;
}
@@ -1393,7 +1393,7 @@ nodeGetCPUCount(void)
VIR_FREE(cpupath);
return ncpu;
#elif defined(__FreeBSD__) || defined(__APPLE__)
- return appleFreebsdNodeGetCPUCount();
+ return virHostCPUGetCountAppleFreeBSD();
#else
virReportError(VIR_ERR_NO_SUPPORT, "%s",
_("host cpu counting not implemented on this platform"));
@@ -1402,22 +1402,22 @@ nodeGetCPUCount(void)
}
virBitmapPtr
-nodeGetPresentCPUBitmap(void)
+virHostCPUGetPresentBitmap(void)
{
#ifdef __linux__
virBitmapPtr present_cpus = NULL;
char *present_path = NULL;
int npresent_cpus;
- if ((npresent_cpus = nodeGetCPUCount()) < 0)
+ if ((npresent_cpus = virHostCPUGetCount()) < 0)
goto cleanup;
- if (!(present_path = linuxGetCPUPresentPath()))
+ if (!(present_path = virHostCPUGetPresentPathLinux()))
goto cleanup;
/* If the cpu/present file is available, parse it and exit */
if (virFileExists(present_path)) {
- present_cpus = linuxParseCPUmap(npresent_cpus, present_path);
+ present_cpus = virHostCPUParseMapLinux(npresent_cpus, present_path);
goto cleanup;
}
@@ -1440,7 +1440,7 @@ nodeGetPresentCPUBitmap(void)
}
virBitmapPtr
-nodeGetOnlineCPUBitmap(void)
+virHostCPUGetOnlineBitmap(void)
{
#ifdef __linux__
char *online_path = NULL;
@@ -1448,14 +1448,14 @@ nodeGetOnlineCPUBitmap(void)
virBitmapPtr cpumap;
int present;
- present = nodeGetCPUCount();
+ present = virHostCPUGetCount();
if (present < 0)
return NULL;
- if (!(online_path = linuxGetCPUOnlinePath()))
+ if (!(online_path = virHostCPUGetOnlinePathLinux()))
return NULL;
if (virFileExists(online_path)) {
- cpumap = linuxParseCPUmap(present, online_path);
+ cpumap = virHostCPUParseMapLinux(present, online_path);
} else {
size_t i;
@@ -1792,9 +1792,9 @@ virHostMemGetParameters(virTypedParameterPtr params
ATTRIBUTE_UNUSED,
}
int
-nodeGetCPUMap(unsigned char **cpumap,
- unsigned int *online,
- unsigned int flags)
+virHostCPUGetMap(unsigned char **cpumap,
+ unsigned int *online,
+ unsigned int flags)
{
virBitmapPtr cpus = NULL;
int ret = -1;
@@ -1803,9 +1803,9 @@ nodeGetCPUMap(unsigned char **cpumap,
virCheckFlags(0, -1);
if (!cpumap && !online)
- return nodeGetCPUCount();
+ return virHostCPUGetCount();
- if (!(cpus = nodeGetOnlineCPUBitmap()))
+ if (!(cpus = virHostCPUGetOnlineBitmap()))
goto cleanup;
if (cpumap && virBitmapToData(cpus, cpumap, &dummy) < 0)
@@ -1994,7 +1994,7 @@ virNodeCapsFillCPUInfo(const char *cpupath ATTRIBUTE_UNUSED,
cpu->core_id = tmp;
- if (!(cpu->siblings = virNodeGetSiblingsList(cpupath, cpu_id)))
+ if (!(cpu->siblings = virNodeGetSiblingsListLinux(cpupath, cpu_id)))
return -1;
return 0;
@@ -2340,7 +2340,7 @@ virHostMemAllocPages(unsigned int npages,
* Returns the number of threads per subcore if subcores are in use, zero
* if subcores are not in use, and a negative value on error */
int
-nodeGetThreadsPerSubcore(virArch arch)
+virHostCPUGetThreadsPerSubcore(virArch arch)
{
int threads_per_subcore = 0;
const char *kvmpath = "/dev/kvm";
@@ -2387,7 +2387,7 @@ nodeGetThreadsPerSubcore(virArch arch)
/* Fallback for nodeGetThreadsPerSubcore() used when KVM headers
* are not available on the system */
int
-nodeGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED)
+virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED)
{
return 0;
}
diff --git a/src/nodeinfo.h b/src/nodeinfo.h
index d89db33..08b9f9d 100644
--- a/src/nodeinfo.h
+++ b/src/nodeinfo.h
@@ -29,10 +29,10 @@
int nodeGetInfo(virNodeInfoPtr nodeinfo);
int nodeCapsInitNUMA(virCapsPtr caps);
-int nodeGetCPUStats(int cpuNum,
- virNodeCPUStatsPtr params,
- int *nparams,
- unsigned int flags);
+int virHostCPUGetStats(int cpuNum,
+ virNodeCPUStatsPtr params,
+ int *nparams,
+ unsigned int flags);
int virHostMemGetStats(int cellNum,
virNodeMemoryStatsPtr params,
int *nparams,
@@ -43,10 +43,10 @@ int virHostMemGetCellsFree(unsigned long long *freeMems,
int virHostMemGetInfo(unsigned long long *mem,
unsigned long long *freeMem);
-virBitmapPtr nodeGetPresentCPUBitmap(void);
-virBitmapPtr nodeGetOnlineCPUBitmap(void);
-int nodeGetCPUCount(void);
-int nodeGetThreadsPerSubcore(virArch arch);
+virBitmapPtr virHostCPUGetPresentBitmap(void);
+virBitmapPtr virHostCPUGetOnlineBitmap(void);
+int virHostCPUGetCount(void);
+int virHostCPUGetThreadsPerSubcore(virArch arch);
int virHostMemGetParameters(virTypedParameterPtr params,
int *nparams,
@@ -56,9 +56,9 @@ int virHostMemSetParameters(virTypedParameterPtr params,
int nparams,
unsigned int flags);
-int nodeGetCPUMap(unsigned char **cpumap,
- unsigned int *online,
- unsigned int flags);
+int virHostCPUGetMap(unsigned char **cpumap,
+ unsigned int *online,
+ unsigned int flags);
int virHostMemGetFreePages(unsigned int npages,
unsigned int *pages,
diff --git a/src/nodeinfopriv.h b/src/nodeinfopriv.h
index 01bcb8d..0fd4391 100644
--- a/src/nodeinfopriv.h
+++ b/src/nodeinfopriv.h
@@ -25,21 +25,21 @@
# include "nodeinfo.h"
# ifdef __linux__
-void linuxNodeInfoSetSysFSSystemPath(const char *path);
+void virHostCPUSetSysFSSystemPathLinux(const char *path);
-int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
- virArch arch,
- unsigned int *cpus,
- unsigned int *mhz,
- unsigned int *nodes,
- unsigned int *sockets,
- unsigned int *cores,
- unsigned int *threads);
+int virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
+ virArch arch,
+ unsigned int *cpus,
+ unsigned int *mhz,
+ unsigned int *nodes,
+ unsigned int *sockets,
+ unsigned int *cores,
+ unsigned int *threads);
-int linuxNodeGetCPUStats(FILE *procstat,
- int cpuNum,
- virNodeCPUStatsPtr params,
- int *nparams);
+int virHostCPUGetStatsLinux(FILE *procstat,
+ int cpuNum,
+ virNodeCPUStatsPtr params,
+ int *nparams);
# endif
#endif /* __NODEINFO_PRIV_H__ */
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index a68c1e7..ef11745 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2166,7 +2166,7 @@ openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED,
int *nparams,
unsigned int flags)
{
- return nodeGetCPUStats(cpuNum, params, nparams, flags);
+ return virHostCPUGetStats(cpuNum, params, nparams, flags);
}
@@ -2207,7 +2207,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
unsigned int *online,
unsigned int flags)
{
- return nodeGetCPUMap(cpumap, online, flags);
+ return virHostCPUGetMap(cpumap, online, flags);
}
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b6d332c..38aab15 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5148,7 +5148,7 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
priv = vm->privateData;
ret = virDomainDefGetVcpuPinInfoHelper(def, maplen, ncpumaps, cpumaps,
- nodeGetCPUCount(),
+ virHostCPUGetCount(),
priv->autoCpuset);
cleanup:
virDomainObjEndAPI(&vm);
@@ -5293,7 +5293,7 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
if (!(def = virDomainObjGetOneDef(vm, flags)))
goto cleanup;
- if ((hostcpus = nodeGetCPUCount()) < 0)
+ if ((hostcpus = virHostCPUGetCount()) < 0)
goto cleanup;
priv = vm->privateData;
@@ -5541,7 +5541,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
if (targetDef->niothreadids == 0)
return 0;
- if ((hostcpus = nodeGetCPUCount()) < 0)
+ if ((hostcpus = virHostCPUGetCount()) < 0)
goto cleanup;
if (VIR_ALLOC_N(info_ret, targetDef->niothreadids) < 0)
@@ -18524,7 +18524,7 @@ qemuNodeGetCPUStats(virConnectPtr conn,
if (virNodeGetCPUStatsEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUStats(cpuNum, params, nparams, flags);
+ return virHostCPUGetStats(cpuNum, params, nparams, flags);
}
@@ -18605,7 +18605,7 @@ qemuNodeGetCPUMap(virConnectPtr conn,
if (virNodeGetCPUMapEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUMap(cpumap, online, flags);
+ return virHostCPUGetMap(cpumap, online, flags);
}
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 274b4d4..7d01e38 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2194,7 +2194,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm)
/* setaffinity fails if you set bits for CPUs which
* aren't present, so we have to limit ourselves */
- if ((hostcpus = nodeGetCPUCount()) < 0)
+ if ((hostcpus = virHostCPUGetCount()) < 0)
goto cleanup;
if (hostcpus > QEMUD_CPUMASK_LEN)
diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index fd6811f..19ba901 100644
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -2792,7 +2792,7 @@ umlNodeGetCPUStats(virConnectPtr conn,
if (virNodeGetCPUStatsEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUStats(cpuNum, params, nparams, flags);
+ return virHostCPUGetStats(cpuNum, params, nparams, flags);
}
@@ -2873,7 +2873,7 @@ umlNodeGetCPUMap(virConnectPtr conn,
if (virNodeGetCPUMapEnsureACL(conn) < 0)
return -1;
- return nodeGetCPUMap(cpumap, online, flags);
+ return virHostCPUGetMap(cpumap, online, flags);
}
diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 1b90447..05097f8 100644
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -3131,7 +3131,7 @@ virCgroupGetPercpuStats(virCgroupPtr group,
}
/* To parse account file, we need to know how many cpus are present. */
- if (!(cpumap = nodeGetPresentCPUBitmap()))
+ if (!(cpumap = virHostCPUGetPresentBitmap()))
return -1;
total_cpus = virBitmapSize(cpumap);
diff --git a/tests/nodeinfomock.c b/tests/nodeinfomock.c
index b9c0152..ac12b5e 100644
--- a/tests/nodeinfomock.c
+++ b/tests/nodeinfomock.c
@@ -23,7 +23,7 @@
#include "nodeinfo.h"
int
-nodeGetThreadsPerSubcore(virArch arch)
+virHostCPUGetThreadsPerSubcore(virArch arch)
{
int threads_per_subcore = 0;
diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index 951ae2f..50b1c82 100644
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -41,10 +41,10 @@ linuxTestCompareFiles(const char *cpuinfofile,
}
memset(&nodeinfo, 0, sizeof(nodeinfo));
- if (linuxNodeInfoCPUPopulate(cpuinfo, arch,
- &nodeinfo.cpus, &nodeinfo.mhz,
- &nodeinfo.nodes, &nodeinfo.sockets,
- &nodeinfo.cores, &nodeinfo.threads) < 0) {
+ if (virHostCPUGetInfoPopulateLinux(cpuinfo, arch,
+ &nodeinfo.cpus, &nodeinfo.mhz,
+ &nodeinfo.nodes, &nodeinfo.sockets,
+ &nodeinfo.cores, &nodeinfo.threads) <
0) {
if (virTestGetDebug()) {
virErrorPtr error = virSaveLastError();
if (error && error->code != VIR_ERR_OK)
@@ -115,14 +115,14 @@ linuxCPUStatsCompareFiles(const char *cpustatfile,
goto fail;
}
- if (linuxNodeGetCPUStats(NULL, 0, NULL, &nparams) < 0)
+ if (virHostCPUGetStatsLinux(NULL, 0, NULL, &nparams) < 0)
goto fail;
if (VIR_ALLOC_N(params, nparams) < 0)
goto fail;
- if (linuxNodeGetCPUStats(cpustat, VIR_NODE_CPU_STATS_ALL_CPUS, params,
- &nparams) < 0)
+ if (virHostCPUGetStatsLinux(cpustat, VIR_NODE_CPU_STATS_ALL_CPUS, params,
+ &nparams) < 0)
goto fail;
if (linuxCPUStatsToBuf(&buf, VIR_NODE_CPU_STATS_ALL_CPUS,
@@ -130,7 +130,7 @@ linuxCPUStatsCompareFiles(const char *cpustatfile,
goto fail;
for (i = 0; i < ncpus; i++) {
- if (linuxNodeGetCPUStats(cpustat, i, params, &nparams) < 0)
+ if (virHostCPUGetStatsLinux(cpustat, i, params, &nparams) < 0)
goto fail;
if (linuxCPUStatsToBuf(&buf, i, params, nparams) < 0)
goto fail;
@@ -179,9 +179,9 @@ linuxTestNodeInfo(const void *opaque)
goto cleanup;
}
- linuxNodeInfoSetSysFSSystemPath(sysfs_prefix);
+ virHostCPUSetSysFSSystemPathLinux(sysfs_prefix);
result = linuxTestCompareFiles(cpuinfo, data->arch, output);
- linuxNodeInfoSetSysFSSystemPath(NULL);
+ virHostCPUSetSysFSSystemPathLinux(NULL);
cleanup:
VIR_FREE(cpuinfo);
diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c
index 6ce03f7..148721d 100644
--- a/tests/vircgrouptest.c
+++ b/tests/vircgrouptest.c
@@ -649,8 +649,8 @@ static int testCgroupGetPercpuStats(const void *args
ATTRIBUTE_UNUSED)
goto cleanup;
}
- if (nodeGetCPUCount() != EXPECTED_NCPUS) {
- fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n",
nodeGetCPUCount());
+ if (virHostCPUGetCount() != EXPECTED_NCPUS) {
+ fprintf(stderr, "Unexpected: nodeGetCPUCount() yields: %d\n",
virHostCPUGetCount());
goto cleanup;
}
--
2.5.5