External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-27 16:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: fix parsing of NUMA settings in VM status XML

Browse Source 
Commit 5bba61f changed the XPath strings to be absolute when parsing
the VM NUMA configuration. Unfortunately the <domain> element is not a
top level element when parsing the domain status XML thus the absolute
XPath string doesn't match.

Use the relative string so that the <numa> settings are not lost.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
(cherry picked from commit d75e23bbfb)
This commit is contained in:
Luyao Huang 2015-03-19 18:13:04 +08:00 committed by Cole Robinson
parent a883fb9c75
commit 28575e750f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/numa_conf.c
View File

@ -663,10 +663,10 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
int ret = -1; int ret = -1;
/* check if NUMA definition is present */ /* check if NUMA definition is present */
if (!virXPathNode("/domain/cpu/numa[1]", ctxt)) if (!virXPathNode("./cpu/numa[1]", ctxt))
return 0; return 0;
if ((n = virXPathNodeSet("/domain/cpu/numa[1]/cell", ctxt, &nodes)) <= 0) { if ((n = virXPathNodeSet("./cpu/numa[1]/cell", ctxt, &nodes)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, "%s", virReportError(VIR_ERR_XML_ERROR, "%s",
_("NUMA topology defined without NUMA cells")); _("NUMA topology defined without NUMA cells"));
goto cleanup; goto cleanup;