[libvirt] [PATCH v3 07/10] storage: Clean up storageBackendCreateQemuImgOpts
Since we only generate the @encinfo when there's a secret object
and thus we need to reference it in the options,
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/storage/storage_util.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index fe588df7dd..e090521d79 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -827,12 +827,8 @@ storageBackendCreateQemuImgOpts(virStorageEncryptionInfoDefPtr
encinfo,
virBufferAsprintf(&buf, "backing_fmt=%s,",
virStorageFileFormatTypeToString(info.backingFormat));
- if (info.format == VIR_STORAGE_FILE_RAW && encinfo) {
+ if (encinfo)
virQEMUBuildQemuImgKeySecretOpts(&buf, encinfo, info.secretAlias);
- } else {
- if (info.encryption)
- virBufferAddLit(&buf, "encryption=on,");
- }
if (info.preallocate) {
if (info.size_arg > info.allocation)
--
2.14.4