From 08c4a54ec006e6899a3bb8cbf7749031773ab3df Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 21 Mar 2019 08:34:10 +0100 Subject: [PATCH] conf: Modify arguments passed to virDomainDiskBackingStoreFormat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass in 'src' rather than the backing store of it. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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, "\n", def->domain_name); -- GitLab