NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

storage: Remove secretPath from _virStorageBackendQemuImgInfo

Browse Source 
There's really no need for it to be there since it's only ever
used inside virStorageBackendCreateQemuImgCmdFromVol

Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
John Ferlan 2018-08-21 11:18:35 -04:00
parent e7d9a8f1f0
commit f6aa977fab
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/storage_util.c
View File

@ -716,7 +716,6 @@ struct _virStorageBackendQemuImgInfo {
int inputFormat; int inputFormat;
char *secretAlias; char *secretAlias;
const char *secretPath;
}; };
@ -1088,7 +1087,6 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
.compat = vol->target.compat, .compat = vol->target.compat,
.features = vol->target.features, .features = vol->target.features,
.nocow = vol->target.nocow, .nocow = vol->target.nocow,
.secretPath = secretPath,
.secretAlias = NULL, .secretAlias = NULL,
}; };
virStorageEncryptionPtr enc = vol->target.encryption; virStorageEncryptionPtr enc = vol->target.encryption;
@ -1131,14 +1129,14 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
virCommandAddArgList(cmd, "-b", info.backingPath, NULL); virCommandAddArgList(cmd, "-b", info.backingPath, NULL);
if (enc) { if (enc) {
if (!info.secretPath) { if (!secretPath) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("path to secret data file is required")); _("path to secret data file is required"));
goto error; goto error;
} }
if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0) if (virAsprintf(&info.secretAlias, "%s_encrypt0", vol->name) < 0)
goto error; goto error;
if (storageBackendCreateQemuImgSecretObject(cmd, info.secretPath, if (storageBackendCreateQemuImgSecretObject(cmd, secretPath,
info.secretAlias) < 0) info.secretAlias) < 0)
goto error; goto error;
encinfo = &enc->encinfo; encinfo = &enc->encinfo;