From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 5 Oct 2022 10:33:19 +0000 (+0200)
Subject: conf: numa: Don't fetch XML node count in virDomainNumatuneParseXML
X-Git-Tag: v8.10.0-rc1~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5575187ecef70cb2eb5120fddf4231b6dd7ee99b;p=thirdparty%2Flibvirt.git

conf: numa: Don't fetch XML node count in virDomainNumatuneParseXML

The code only wants to refuse cases where more than one 'numatune'
element is present which can be achieved by using 'virXPathBoolean'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
index 390ef49b84..688aa7b409 100644
--- a/src/conf/numa_conf.c
+++ b/src/conf/numa_conf.c
@@ -226,18 +226,13 @@ virDomainNumatuneParseXML(virDomainNuma *numa,
 {
     g_autofree char *modestr = NULL;
     int mode = -1;
-    int n = 0;
     g_autofree char *placementstr = NULL;
     int placement = -1;
     g_autofree char *nodesetstr = NULL;
     g_autoptr(virBitmap) nodeset = NULL;
     xmlNodePtr node = NULL;
 
-    if (virXPathInt("count(./numatune)", ctxt, &n) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("cannot extract numatune nodes"));
-        return -1;
-    } else if (n > 1) {
+    if (virXPathBoolean("count(./numatune) > 1", ctxt) == 1) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("only one numatune is supported"));
         return -1;