[PATCH 3/5] storage: Alter storageBackendCreateQemuImgSecretObject args

[John Ferlan <jferlan@xxxxxxxxxx>]

Since all that was really needed was a couple of fields and building
the object can be more generic, let's alter the args a bit. This will
be useful shortly for adding the secret object for a volume resize
operation on a luks volume that will need a secret object.

Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
 src/storage/storage_util.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 561899a3d0..e6d2747e8d 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -1120,17 +1120,14 @@ storageBackendCreateQemuImgSetOptions(virCommandPtr cmd,
  */
 static int
 storageBackendCreateQemuImgSecretObject(virCommandPtr cmd,
-                                        virStorageVolDefPtr vol,
-                                        struct _virStorageBackendQemuImgInfo *info)
+                                        const char *secretPath,
+                                        const char *secretAlias)
 {
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     char *commandStr = NULL;
 
-    if (virAsprintf(&info->secretAlias, "%s_luks0", vol->name) < 0)
-        return -1;
-
-    virBufferAsprintf(&buf, "secret,id=%s,file=", info->secretAlias);
-    virQEMUBuildBufferEscapeComma(&buf, info->secretPath);
+    virBufferAsprintf(&buf, "secret,id=%s,file=", secretAlias);
+    virQEMUBuildBufferEscapeComma(&buf, secretPath);
 
     if (virBufferCheckError(&buf) < 0) {
         virBufferFreeAndReset(&buf);
@@ -1261,7 +1258,10 @@ virStorageBackendCreateQemuImgCmdFromVol(virConnectPtr conn,
     if (info.format == VIR_STORAGE_FILE_RAW &&
         vol->target.encryption != NULL &&
         vol->target.encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS) {
-        if (storageBackendCreateQemuImgSecretObject(cmd, vol, &info) < 0)
+        if (virAsprintf(&info.secretAlias, "%s_luks0", vol->name) < 0)
+            goto error;
+        if (storageBackendCreateQemuImgSecretObject(cmd, info.secretPath,
+                                                    info.secretAlias) < 0)
             goto error;
         enc = &vol->target.encryption->encinfo;
     }
-- 
2.13.6

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