External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-24 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: use virXMLPropString for IOThread pin parsing

Browse Source 
XPath is good for random search of elements, not for accessing
attributes of one node.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-08-14 14:31:52 +02:00
parent 954b52cd8b
commit 4785a401f9
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/conf/domain_conf.c
View File

@ -16362,19 +16362,15 @@ virDomainVcpuPinDefParseXML(virDomainDefPtr def,
*/ */
static int static int
virDomainIOThreadPinDefParseXML(xmlNodePtr node, virDomainIOThreadPinDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
virDomainDefPtr def) virDomainDefPtr def)
{ {
int ret = -1; int ret = -1;
virDomainIOThreadIDDefPtr iothrid; virDomainIOThreadIDDefPtr iothrid;
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
xmlNodePtr oldnode = ctxt->node;
unsigned int iothreadid; unsigned int iothreadid;
char *tmp = NULL; char *tmp = NULL;
ctxt->node = node; if (!(tmp = virXMLPropString(node, "iothread"))) {
if (!(tmp = virXPathString("string(./@iothread)", ctxt))) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing iothread id in iothreadpin")); _("missing iothread id in iothreadpin"));
goto cleanup; goto cleanup;
@ -16430,7 +16426,6 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
cleanup: cleanup:
VIR_FREE(tmp); VIR_FREE(tmp);
virBitmapFree(cpumask); virBitmapFree(cpumask);
ctxt->node = oldnode;
return ret; return ret;
} }
@ -17705,7 +17700,7 @@ virDomainDefParseXML(xmlDocPtr xml,
} }
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (virDomainIOThreadPinDefParseXML(nodes[i], ctxt, def) < 0) if (virDomainIOThreadPinDefParseXML(nodes[i], def) < 0)
goto error; goto error;
} }
VIR_FREE(nodes); VIR_FREE(nodes);