External/libvirt
1
0
Fork 0
Code

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2022-10-05 12:33:19 +02:00
parent 136f351b0f
commit 5575187ece
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/numa_conf.c
View File

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