[PATCH 16/43] conf: numa: Don't fetch XML node count in virDomainNumatuneParseXML

Ján Tomko jtomko at redhat.com
Tue Nov 1 16:37:58 UTC 2022


On a Monday in 2022, Peter Krempa wrote:
>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 at redhat.com>
>---
> src/conf/numa_conf.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
>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) {

Alternatively, "boolean(./numatune[1])"

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano


More information about the libvir-list mailing list