[PATCH 22/43] testParseNodeInfo: Rewrite to virXPathU(Int|LongLong)
Use the function for appropriate types and simplify the error logic.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/test/test_driver.c | 51 +++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 31 deletions(-)
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 67c70de11d..5a988fbcbd 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -874,41 +874,30 @@ testParseXMLDocFromFile(xmlNodePtr node,
static int
testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt)
{
- long l;
- int ret;
g_autofree char *str = NULL;
+ unsigned int activeCpus;
+ unsigned long long memory = 0;
+ int rc;
- ret = virXPathLong("string(/node/cpu/nodes[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->nodes = l;
- } else if (ret == -2) {
+ if (virXPathUInt("string(/node/cpu/nodes[1])", ctxt,
&nodeInfo->nodes) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu nodes value"));
return -1;
}
- ret = virXPathLong("string(/node/cpu/sockets[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->sockets = l;
- } else if (ret == -2) {
+ if (virXPathUInt("string(/node/cpu/sockets[1])", ctxt,
&nodeInfo->sockets) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu sockets value"));
return -1;
}
- ret = virXPathLong("string(/node/cpu/cores[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->cores = l;
- } else if (ret == -2) {
+ if (virXPathUInt("string(/node/cpu/cores[1])", ctxt,
&nodeInfo->cores) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu cores value"));
return -1;
}
- ret = virXPathLong("string(/node/cpu/threads[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->threads = l;
- } else if (ret == -2) {
+ if (virXPathUInt("string(/node/cpu/threads[1])", ctxt,
&nodeInfo->threads) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu threads value"));
return -1;
@@ -916,19 +905,19 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt)
nodeInfo->cpus = (nodeInfo->cores * nodeInfo->threads *
nodeInfo->sockets * nodeInfo->nodes);
- ret = virXPathLong("string(/node/cpu/active[1])", ctxt, &l);
- if (ret == 0) {
- if (l < nodeInfo->cpus)
- nodeInfo->cpus = l;
- } else if (ret == -2) {
+
+ if ((rc = virXPathUInt("string(/node/cpu/active[1])", ctxt,
&activeCpus)) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu active value"));
return -1;
}
- ret = virXPathLong("string(/node/cpu/mhz[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->mhz = l;
- } else if (ret == -2) {
+
+ if (rc == 0) {
+ if (activeCpus < nodeInfo->cpus)
+ nodeInfo->cpus = activeCpus;
+ }
+
+ if (virXPathUInt("string(/node/cpu/mhz[1])", ctxt, &nodeInfo->mhz)
== -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node cpu mhz value"));
return -1;
@@ -943,15 +932,15 @@ testParseNodeInfo(virNodeInfoPtr nodeInfo, xmlXPathContextPtr ctxt)
}
}
- ret = virXPathLong("string(/node/memory[1])", ctxt, &l);
- if (ret == 0) {
- nodeInfo->memory = l;
- } else if (ret == -2) {
+ if ((rc = virXPathULongLong("string(/node/memory[1])", ctxt, &memory))
== -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid node memory value"));
return -1;
}
+ if (rc == 0)
+ nodeInfo->memory = memory;
+
return 0;
}
--
2.37.3