1:40 p.m.
From: "Daniel P. Berrange" <berrange(a)redhat.com>
Update the nodeinfo helper code to use virReportError instead
of the nodeReportError custom macro
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
cfg.mk | 1 -
src/nodeinfo.c | 104 +++++++++++++++++++++++++++-----------------------------
2 files changed, 50 insertions(+), 55 deletions(-)
diff --git a/cfg.mk b/cfg.mk
index 6e1f6af..334a5c5 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -508,7 +508,6 @@ sc_avoid_attribute_unused_in_header:
msg_gen_function =
msg_gen_function += VIR_ERROR
msg_gen_function += lxcError
-msg_gen_function += nodeReportError
msg_gen_function += regerror
msg_gen_function += vah_error
msg_gen_function += vah_warning
diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index a892e7a..ad4c787 100644
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -52,10 +52,6 @@
#define VIR_FROM_THIS VIR_FROM_NONE
-#define nodeReportError(code, ...) \
- virReportErrorHelper(VIR_FROM_NONE, code, __FILE__, \
- __FUNCTION__, __LINE__, __VA_ARGS__)
-
#ifdef __linux__
# define CPUINFO_PATH "/proc/cpuinfo"
# define SYSFS_SYSTEM_PATH "/sys/devices/system"
@@ -114,9 +110,9 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char
*file,
goto cleanup;
}
if (virStrToLong_i(value_str, &tmp, 10, &value) < 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- _("could not convert '%s' to an integer"),
- value_str);
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("could not convert '%s' to an integer"),
+ value_str);
goto cleanup;
}
@@ -269,8 +265,8 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int
*threads)
/* Parse socket */
sock = virNodeParseSocket(node, cpu);
if (!CPU_ISSET(sock, &sock_map)) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("CPU socket topology has changed"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("CPU socket topology has changed"));
goto cleanup;
}
@@ -357,8 +353,8 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
buf++;
if (*buf != ':' || !buf[1]) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("parsing cpu MHz from cpuinfo"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("parsing cpu MHz from cpuinfo"));
goto cleanup;
}
@@ -380,8 +376,8 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo,
buf++;
if (*buf != ':' || !buf[1]) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("parsing cpu MHz from cpuinfo"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("parsing cpu MHz from cpuinfo"));
goto cleanup;
}
@@ -479,17 +475,17 @@ fallback:
done:
/* There should always be at least one cpu, socket, node, and thread. */
if (nodeinfo->cpus == 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no CPUs
found"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no CPUs
found"));
goto cleanup;
}
if (nodeinfo->sockets == 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no sockets
found"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no sockets
found"));
goto cleanup;
}
if (nodeinfo->threads == 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no threads
found"));
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("no threads
found"));
goto cleanup;
}
@@ -560,8 +556,8 @@ int linuxNodeGetCPUStats(FILE *procstat,
switch (i) {
case 0: /* fill kernel cpu time here */
if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_KERNEL) ==
NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field kernel cpu time too
long for destination"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field kernel cpu time too
long for destination"));
goto cleanup;
}
param->value = (sys + irq + softirq) * TICK_TO_NSEC;
@@ -569,8 +565,8 @@ int linuxNodeGetCPUStats(FILE *procstat,
case 1: /* fill user cpu time here */
if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_USER) ==
NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field kernel cpu time too
long for destination"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field kernel cpu time too
long for destination"));
goto cleanup;
}
param->value = (usr + ni) * TICK_TO_NSEC;
@@ -578,8 +574,8 @@ int linuxNodeGetCPUStats(FILE *procstat,
case 2: /* fill idle cpu time here */
if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IDLE) ==
NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field kernel cpu time too
long for destination"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field kernel cpu time too
long for destination"));
goto cleanup;
}
param->value = idle * TICK_TO_NSEC;
@@ -587,8 +583,8 @@ int linuxNodeGetCPUStats(FILE *procstat,
case 3: /* fill iowait cpu time here */
if (virStrcpyStatic(param->field, VIR_NODE_CPU_STATS_IOWAIT) ==
NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field kernel cpu time too
long for destination"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field kernel cpu time too
long for destination"));
goto cleanup;
}
param->value = iowait * TICK_TO_NSEC;
@@ -673,8 +669,8 @@ int linuxNodeGetMemoryStats(FILE *meminfo,
for (i = 0; i < 2; i++) {
p = strchr(p, ' ');
if (p == NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("no prefix found"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("no prefix found"));
goto cleanup;
}
p++;
@@ -692,8 +688,8 @@ int linuxNodeGetMemoryStats(FILE *meminfo,
virNodeMemoryStatsPtr param = ¶ms[k++];
if (virStrcpyStatic(param->field, convp->field) == NULL) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Field kernel memory too long
for destination"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Field kernel memory too long
for destination"));
goto cleanup;
}
param->value = val;
@@ -706,8 +702,8 @@ int linuxNodeGetMemoryStats(FILE *meminfo,
}
if (found == 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("no available memory line found"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("no available memory line found"));
goto cleanup;
}
@@ -792,8 +788,8 @@ cleanup:
}
#else
/* XXX Solaris will need an impl later if they port QEMU driver */
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node info not implemented on this platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("node info not implemented on this platform"));
return -1;
#endif
}
@@ -821,8 +817,8 @@ int nodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED,
return ret;
}
#else
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node CPU stats not implemented on this platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("node CPU stats not implemented on this platform"));
return -1;
#endif
}
@@ -851,8 +847,8 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
# if HAVE_NUMACTL
if (numa_available() < 0) {
# endif
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("NUMA not supported on this
host"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("NUMA not supported on this
host"));
return -1;
# if HAVE_NUMACTL
}
@@ -888,8 +884,8 @@ int nodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED,
return ret;
}
#else
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node memory stats not implemented on this platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("node memory stats not implemented on this platform"));
return -1;
#endif
}
@@ -912,8 +908,8 @@ nodeGetCPUmap(virConnectPtr conn ATTRIBUTE_UNUSED,
VIR_FREE(path);
return cpumap;
#else
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("node cpumap not implemented on this platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("node cpumap not implemented on this platform"));
return NULL;
#endif
}
@@ -1006,15 +1002,15 @@ nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int maxCell;
if (numa_available() < 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("NUMA not supported on this host"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("NUMA not supported on this host"));
goto cleanup;
}
maxCell = numa_max_node();
if (startCell > maxCell) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- _("start cell %d out of range (0-%d)"),
- startCell, maxCell);
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ _("start cell %d out of range (0-%d)"),
+ startCell, maxCell);
goto cleanup;
}
lastCell = startCell + maxCells - 1;
@@ -1024,7 +1020,7 @@ nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
for (numCells = 0, n = startCell ; n <= lastCell ; n++) {
long long mem;
if (numa_node_size64(n, &mem) < 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
+ virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to query NUMA free memory for node: %d"),
n);
goto cleanup;
@@ -1044,16 +1040,16 @@ nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
int n;
if (numa_available() < 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("NUMA not supported on this host"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("NUMA not supported on this host"));
goto cleanup;
}
for (n = 0 ; n <= numa_max_node() ; n++) {
long long mem;
if (numa_node_size64(n, &mem) < 0) {
- nodeReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("Failed to query NUMA free
memory"));
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "%s", _("Failed to query NUMA free
memory"));
goto cleanup;
}
freeMem += mem;
@@ -1073,15 +1069,15 @@ int nodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
int startCell ATTRIBUTE_UNUSED,
int maxCells ATTRIBUTE_UNUSED)
{
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("NUMA memory information not available on this
platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("NUMA memory information not available on this
platform"));
return -1;
}
unsigned long long nodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
{
- nodeReportError(VIR_ERR_NO_SUPPORT, "%s",
- _("NUMA memory information not available on this
platform"));
+ virReportError(VIR_ERR_NO_SUPPORT, "%s",
+ _("NUMA memory information not available on this
platform"));
return 0;
}
#endif
--
1.7.10.4