From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 16 Aug 2017 08:28:16 +0000 (+0200)
Subject: conf: use virXMLNodeContentString for boot options parsing
X-Git-Tag: v3.7.0-rc1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49991b74d95da1d062430590933d5ff749711556;p=thirdparty%2Flibvirt.git

conf: use virXMLNodeContentString for boot options parsing

Using XPath here doesn't add any benefit.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ea293b9f02..db042e5dc1 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17062,7 +17062,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
                              virHashTablePtr *bootHash)
 {
     xmlNodePtr *nodes = NULL;
-    xmlNodePtr oldnode;
     char *tmp = NULL;
     char *name = NULL;
     int ret = -1;
@@ -17169,8 +17168,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
         }
 
         if (n == 1) {
-            oldnode = ctxt->node;
-            ctxt->node = nodes[0];
             tmp = virXMLPropString(nodes[0], "type");
 
             if (!tmp) {
@@ -17181,7 +17178,7 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
 
             if (STREQ_NULLABLE(tmp, "slic")) {
                 VIR_FREE(tmp);
-                tmp = virXPathString("string(.)", ctxt);
+                tmp = virXMLNodeContentString(nodes[0]);
                 def->os.slic_table = virFileSanitizePath(tmp);
                 VIR_FREE(tmp);
             } else {
@@ -17190,7 +17187,6 @@ virDomainDefParseBootOptions(virDomainDefPtr def,
                                tmp);
                 goto error;
             }
-            ctxt->node = oldnode;
         }
 
         if (virDomainDefParseBootXML(ctxt, def) < 0)