From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 2 Aug 2019 13:02:50 +0000 (+0200)
Subject: conf: domain: Parse backingStore with VIR_DOMAIN_DEF_PARSE_DISK_SOURCE
X-Git-Tag: v5.7.0-rc1~206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4807051b02e5a17f92baafb3b2db3d379d1a32a4;p=thirdparty%2Flibvirt.git

conf: domain: Parse backingStore with VIR_DOMAIN_DEF_PARSE_DISK_SOURCE

The only code path which calls the parser with the
VIR_DOMAIN_DEF_PARSE_DISK_SOURCE is from qemuDomainBlockCopy. Since that
code path can properly handle backing chains for the disk and it's
desired to pass the parsed chains to the block copy code remove the
condition which prevents parsing the <backingStore> element.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3907fcf6e5..8642927d6b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10299,10 +10299,8 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
     VIR_STEAL_PTR(def->vendor, vendor);
     VIR_STEAL_PTR(def->product, product);
 
-    if (!(flags & VIR_DOMAIN_DEF_PARSE_DISK_SOURCE)) {
-        if (virDomainDiskBackingStoreParse(ctxt, def->src, flags, xmlopt) < 0)
-            goto error;
-    }
+    if (virDomainDiskBackingStoreParse(ctxt, def->src, flags, xmlopt) < 0)
+        goto error;
 
     if (flags & VIR_DOMAIN_DEF_PARSE_STATUS &&
         virDomainDiskDefParsePrivateData(ctxt, def, xmlopt) < 0)