From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 21 Mar 2019 07:34:10 +0000 (+0100)
Subject: conf: Modify arguments passed to virDomainDiskBackingStoreFormat
X-Git-Tag: v5.3.0-rc1~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08c4a54ec006e6899a3bb8cbf7749031773ab3df;p=thirdparty%2Flibvirt.git

conf: Modify arguments passed to virDomainDiskBackingStoreFormat

Pass in 'src' rather than the backing store of it.

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 bc7843e570..82473d1157 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23840,13 +23840,14 @@ virDomainDiskSourceFormat(virBufferPtr buf,
 
 static int
 virDomainDiskBackingStoreFormat(virBufferPtr buf,
-                                virStorageSourcePtr backingStore,
+                                virStorageSourcePtr src,
                                 virDomainXMLOptionPtr xmlopt,
                                 unsigned int flags)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
     bool inactive = flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE;
+    virStorageSourcePtr backingStore = src->backingStore;
 
     virBufferSetChildIndent(&childBuf, buf);
 
@@ -23879,8 +23880,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, false, flags, xmlopt) < 0)
         return -1;
 
-    if (virDomainDiskBackingStoreFormat(&childBuf, backingStore->backingStore,
-                                        xmlopt, flags) < 0)
+    if (virDomainDiskBackingStoreFormat(&childBuf, backingStore, xmlopt, flags) < 0)
         return -1;
 
     if (virXMLFormatElement(buf, "backingStore", &attrBuf, &childBuf) < 0)
@@ -24142,8 +24142,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
 
     /* Don't format backingStore to inactive XMLs until the code for
      * persistent storage of backing chains is ready. */
-    if (virDomainDiskBackingStoreFormat(buf, def->src->backingStore,
-                                        xmlopt, flags) < 0)
+    if (virDomainDiskBackingStoreFormat(buf, def->src, xmlopt, flags) < 0)
         return -1;
 
     virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name);