[PATCH 33/34] conf: Remove @seclabels from virDomainDiskSourceFormat

[Peter Krempa <pkrempa@xxxxxxxxxx>]

All callers pass in 'true' so we can remove the parameter.

Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
---
 src/conf/domain_conf.c   | 9 ++++-----
 src/conf/domain_conf.h   | 1 -
 src/conf/snapshot_conf.c | 2 +-
 tests/virstoragetest.c   | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 105ece2b7c..d12a8dcaf9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23892,7 +23892,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,

     virBufferAsprintf(&childBuf, "<format type='%s'/>\n",
                       virStorageFileFormatTypeToString(backingStore->format));
-    if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, flags, true,
+    if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, flags,
                                   false, true, xmlopt) < 0)
         return -1;

@@ -23953,7 +23953,6 @@ virDomainDiskSourceFormat(virBufferPtr buf,
                           virStorageSourcePtr src,
                           int policy,
                           unsigned int flags,
-                          bool seclabels,
                           bool attrIndex,
                           bool backingStore,
                           virDomainXMLOptionPtr xmlopt)
@@ -23964,7 +23963,7 @@ virDomainDiskSourceFormat(virBufferPtr buf,
     virBufferSetChildIndent(&childBuf, buf);

     if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags,
-                                     seclabels, attrIndex,
+                                     true, attrIndex,
                                      policy, xmlopt) < 0)
         return -1;

@@ -24129,7 +24128,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
     virBufferEscapeString(buf, "<format type='%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, flags, true, true, true,
+    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, flags, true, true,
                                   xmlopt) < 0)
         return -1;
     virBufferAdjustIndent(buf, -2);
@@ -24227,7 +24226,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
         virStorageAuthDefFormat(buf, def->src->auth);

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

     virBufferEscapeString(buf, "<backenddomain name='%s'/>\n", def->domain_name);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 7ab7b28e4f..26c6f45685 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3016,7 +3016,6 @@ int virDomainDiskSourceFormat(virBufferPtr buf,
                               virStorageSourcePtr src,
                               int policy,
                               unsigned int flags,
-                              bool seclabels,
                               bool attrIndex,
                               bool backingStore,
                               virDomainXMLOptionPtr xmlopt);
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 4cc4795cf4..da27dcc1a1 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -752,7 +752,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, true, false, false, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, false, false, xmlopt) < 0)
         return -1;

     virBufferAdjustIndent(buf, -2);
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 9a11f5bfe8..ba97a80d45 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, true, false, false, NULL) < 0 ||
+    if (virDomainDiskSourceFormat(&buf, src, 0, 0, false, false, NULL) < 0 ||
         !(xml = virBufferContentAndReset(&buf))) {
         fprintf(stderr, "failed to format disk source xml\n");
         goto cleanup;
-- 
2.20.1

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list