From 9629fe258f3fbebdb6128a2f1fa59862fd60e72e Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Thu, 19 Apr 2018 09:47:31 -0400
Subject: [PATCH] storage_util: Rename virQEMUBuildLuksOpts

Rename to storageBackendCreateQemuImgOpts - which is what it's doing.

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 src/libvirt_private.syms   | 2 +-
 src/storage/storage_util.c | 2 +-
 src/util/virqemu.c         | 8 ++++----
 src/util/virqemu.h         | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b03596ad4d..98529bd5ef 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2596,8 +2596,8 @@ virQEMUBuildCommandLineJSON;
 virQEMUBuildCommandLineJSONArrayBitmap;
 virQEMUBuildCommandLineJSONArrayNumbered;
 virQEMUBuildDriveCommandlineFromJSON;
-virQEMUBuildLuksOpts;
 virQEMUBuildObjectCommandlineFromJSON;
+virQEMUBuildQemuImgKeySecretOpts;
 
 
 # util/virrandom.h
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 4dd73f2734..37a649d17b 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -823,7 +823,7 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDefPtr enc,
     virBuffer buf = VIR_BUFFER_INITIALIZER;
 
     if (info.format == VIR_STORAGE_FILE_RAW && enc) {
-        virQEMUBuildLuksOpts(&buf, enc, info.secretAlias);
+        virQEMUBuildQemuImgKeySecretOpts(&buf, enc, info.secretAlias);
     } else {
         if (info.backingPath)
             virBufferAsprintf(&buf, "backing_fmt=%s,",
diff --git a/src/util/virqemu.c b/src/util/virqemu.c
index d6652262fe..04cd71605e 100644
--- a/src/util/virqemu.c
+++ b/src/util/virqemu.c
@@ -303,7 +303,7 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str)
 
 
 /**
- * virQEMUBuildLuksOpts:
+ * virQEMUBuildQemuImgKeySecretOpts:
  * @buf: buffer to build the string into
  * @enc: pointer to encryption info
  * @alias: alias to use
@@ -323,9 +323,9 @@ virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str)
  *
  */
 void
-virQEMUBuildLuksOpts(virBufferPtr buf,
-                     virStorageEncryptionInfoDefPtr enc,
-                     const char *alias)
+virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
+                                 virStorageEncryptionInfoDefPtr enc,
+                                 const char *alias)
 {
     virBufferAsprintf(buf, "key-secret=%s,", alias);
 
diff --git a/src/util/virqemu.h b/src/util/virqemu.h
index 539d62ab14..2599481753 100644
--- a/src/util/virqemu.h
+++ b/src/util/virqemu.h
@@ -50,9 +50,9 @@ char *virQEMUBuildObjectCommandlineFromJSON(const char *type,
 char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src);
 
 void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str);
-void virQEMUBuildLuksOpts(virBufferPtr buf,
-                          virStorageEncryptionInfoDefPtr enc,
-                          const char *alias)
+void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
+                                      virStorageEncryptionInfoDefPtr enc,
+                                      const char *alias)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
 #endif /* __VIR_QEMU_H_ */
-- 
GitLab