There's really no need for it to be there since it's only ever used inside virStorageBackendCreateQemuImgCmdFromVol Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx> --- src/storage/storage_util.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 42a9b6abf0..b32e3ccf7d 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -716,7 +716,6 @@ struct _virStorageBackendQemuImgInfo { int inputFormat; char *secretAlias; - const char *secretPath; }; @@ -1088,7 +1087,6 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, .compat = vol->target.compat, .features = vol->target.features, .nocow = vol->target.nocow, - .secretPath = secretPath, .secretAlias = NULL, }; virStorageEncryptionPtr enc = vol->target.encryption; @@ -1131,14 +1129,14 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool, virCommandAddArgList(cmd, "-b", info.backingPath, NULL); if (enc) { - if (!info.secretPath) { + if (!secretPath) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("path to secret data file is required")); goto error; } if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0) goto error; - if (storageBackendCreateQemuImgSecretObject(cmd, info.secretPath, + if (storageBackendCreateQemuImgSecretObject(cmd, secretPath, info.secretAlias) < 0) goto error; encinfo = &enc->encinfo; -- 2.17.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list