From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 2 Dec 2020 13:29:30 +0000 (+0100)
Subject: virDomainCheckpointDefParse: Don't extract unused domain type
X-Git-Tag: v7.0.0-rc1~324
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1fd4a37555123fbdf9ebb77f3a004320d75b1a3;p=thirdparty%2Flibvirt.git

virDomainCheckpointDefParse: Don't extract unused domain type

We can extract './domain' directly and let the parser deal with the
type.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c
index 089488fbc6..697688cf8c 100644
--- a/src/conf/checkpoint_conf.c
+++ b/src/conf/checkpoint_conf.c
@@ -126,7 +126,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
     virDomainCheckpointDefPtr ret = NULL;
     size_t i;
     int n;
-    char *tmp;
     g_autofree xmlNodePtr *nodes = NULL;
     g_autoptr(virDomainCheckpointDef) def = NULL;
 
@@ -146,6 +145,8 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
     def->parent.description = virXPathString("string(./description)", ctxt);
 
     if (flags & VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE) {
+        xmlNodePtr domainNode;
+
         if (virXPathLongLong("string(./creationTime)", ctxt,
                              &def->parent.creationTime) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -155,17 +156,10 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
 
         def->parent.parent_name = virXPathString("string(./parent/name)", ctxt);
 
-        if ((tmp = virXPathString("string(./domain/@type)", ctxt))) {
+        if ((domainNode = virXPathNode("./domain", ctxt))) {
             int domainflags = VIR_DOMAIN_DEF_PARSE_INACTIVE |
                               VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE;
-            xmlNodePtr domainNode = virXPathNode("./domain", ctxt);
 
-            VIR_FREE(tmp);
-            if (!domainNode) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("missing domain in checkpoint"));
-                return NULL;
-            }
             def->parent.dom = virDomainDefParseNode(ctxt->node->doc, domainNode,
                                                     xmlopt, parseOpaque,
                                                     domainflags);