storage_util: Rename virQEMUBuildLuksOpts

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

Signed-off-by: John Ferlan <jferlan@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b03596ad4de97a813f4ed4fddee584d5f3197034..98529bd5ef4a47dadd5b952a1029d4736c2f23c7 100644 (file)
--- 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 4dd73f27342b8da61299e2f3ce1ccc4b2bec7380..37a649d17ba11dff9a9e040ded32377f7843d418 100644 (file)
--- 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 d6652262fea8fab06bd998365f6de312cf02456d..04cd71605efbff56d73258801e5cc136049cce0c 100644 (file)
--- 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 539d62ab14ca0632a21a30f89931a504abfae10f..2599481753a6c769f0263761fec5a5f7a5917ff7 100644 (file)
--- 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_ */