[libvirt] [PATCH v2 03/29] conf: Merge virDomainDiskSourceFormatInternal into virDomainDiskSourceFormat

[Peter Krempa]

Remove the wrapper and fix callers.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/domain_conf.c   | 35 +++++++++++------------------------
 src/conf/domain_conf.h   |  1 +
 src/conf/snapshot_conf.c |  2 +-
 tests/qemublocktest.c    |  2 +-
 tests/virstoragetest.c   |  2 +-
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 69fd4a7c57..adb20e33f2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23787,13 +23787,13 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
 }


-static int
-virDomainDiskSourceFormatInternal(virBufferPtr buf,
-                                  virStorageSourcePtr src,
-                                  int policy,
-                                  unsigned int flags,
-                                  bool attrIndex,
-                                  virDomainXMLOptionPtr xmlopt)
+int
+virDomainDiskSourceFormat(virBufferPtr buf,
+                          virStorageSourcePtr src,
+                          int policy,
+                          bool attrIndex,
+                          unsigned int flags,
+                          virDomainXMLOptionPtr xmlopt)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
@@ -23824,18 +23824,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
 }


-int
-virDomainDiskSourceFormat(virBufferPtr buf,
-                          virStorageSourcePtr src,
-                          int policy,
-                          unsigned int flags,
-                          virDomainXMLOptionPtr xmlopt)
-{
-    return virDomainDiskSourceFormatInternal(buf, src, policy, flags,
-                                             false, xmlopt);
-}
-
-
 static int
 virDomainDiskBackingStoreFormat(virBufferPtr buf,
                                 virStorageSourcePtr backingStore,
@@ -23873,8 +23861,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAdjustIndent(buf, 2);

     virBufferAsprintf(buf, "<format type='%s'/>\n", format);
-    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags,
-                                          false, xmlopt) < 0 ||
+    if (virDomainDiskSourceFormat(buf, backingStore, 0, false, flags, xmlopt) < 0 ||
         virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
                                         xmlopt, flags) < 0)
         return -1;
@@ -24035,7 +24022,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
     virBufferEscapeString(buf, "<format type='%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, 0, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, false, 0, xmlopt) < 0)
         return -1;
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</mirror>\n");
@@ -24131,8 +24118,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
     if (def->src->auth && !def->src->authInherited)
         virStorageAuthDefFormat(buf, def->src->auth);

-    if (virDomainDiskSourceFormatInternal(buf, def->src, def->startupPolicy,
-                                          flags, true, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, def->src, def->startupPolicy, true,
+                                  flags, xmlopt) < 0)
         return -1;

     /* Don't format backingStore to inactive XMLs until the code for
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 25c10a9af3..f0c2a51212 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3014,6 +3014,7 @@ int virDomainDefFormatInternal(virDomainDefPtr def,
 int virDomainDiskSourceFormat(virBufferPtr buf,
                               virStorageSourcePtr src,
                               int policy,
+                              bool attrIndex,
                               unsigned int flags,
                               virDomainXMLOptionPtr xmlopt);

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 52abafab0f..58d2cfee99 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -776,7 +776,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
     if (disk->src->format > 0)
         virBufferEscapeString(buf, "<driver type='%s'/>\n",
                               virStorageFileFormatTypeToString(disk->src->format));
-    if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, disk->src, 0, false, 0, xmlopt) < 0)
         return -1;

     virBufferAdjustIndent(buf, -2);
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index becd31a0ad..46e75c2df5 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -86,7 +86,7 @@ testBackingXMLjsonXML(const void *args)
         return -1;
     }

-    if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, 0, NULL) < 0 ||
+    if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, false, 0, NULL) < 0 ||
         !(actualxml = virBufferContentAndReset(&buf))) {
         fprintf(stderr, "failed to format disk source xml\n");
         return -1;
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index fb98903f02..d29181dea9 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -657,7 +657,7 @@ testBackingParse(const void *args)
         goto cleanup;
     }

-    if (virDomainDiskSourceFormat(&buf, src, 0, 0, NULL) < 0 ||
+    if (virDomainDiskSourceFormat(&buf, src, 0, false, 0, NULL) < 0 ||
         !(xml = virBufferContentAndReset(&buf))) {
         fprintf(stderr, "failed to format disk source xml\n");
         goto cleanup;
-- 
2.20.1