Re: [libvirt] [PATCH 11/34] conf: Move backingStore formating into virDomainDiskSourceFormat

Move the recursion to format the full backing store into virDomainDiskSourceFormat controlled by a new argument so that it's simpler to reuse in other places. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/conf/domain_conf.c | 30 +++++++++++++++--------------- src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 2 +- tests/qemublocktest.c | 2 +- tests/virstoragetest.c | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9d738f06cd..b67f9bbd2c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23954,6 +23950,7 @@ virDomainDiskSourceFormat(virBufferPtr buf, unsigned int flags, bool seclabels, bool attrIndex, + bool backingStore,

virDomainXMLOptionPtr xmlopt) { VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; @@ -23962,10 +23959,18 @@ virDomainDiskSourceFormat(virBufferPtr buf, virBufferSetChildIndent(&childBuf, buf); if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags, - seclabels, attrIndex, policy, xmlopt) < 0) + seclabels, attrIndex, + policy, xmlopt) < 0)

return -1; - return virXMLFormatElement(buf, "source", &attrBuf, &childBuf); + if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0) + return -1;

+ + if (backingStore && src->backingStore &&

+ virDomainDiskBackingStoreFormat(buf, src->backingStore, xmlopt, flags) < 0) + return -1; + + return 0; }