block: deprecate "encryption=on" in favor of "encrypt.format=aes"

[mirror_qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index f7ffb79db6fcdc363fd5530fbf9c59d002c35357..ae4fe6d83af769c7418577aa6592507ad3c2aeee 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2264,6 +2264,8 @@ static int img_convert(int argc, char **argv)
     if (s.compressed) {
         bool encryption =
             qemu_opt_get_bool(opts, BLOCK_OPT_ENCRYPT, false);
+        const char *encryptfmt =
+            qemu_opt_get(opts, BLOCK_OPT_ENCRYPT_FORMAT);
         const char *preallocation =
             qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
 
@@ -2273,7 +2275,7 @@ static int img_convert(int argc, char **argv)
             goto out;
         }
 
-        if (encryption) {
+        if (encryption || encryptfmt) {
             error_report("Compression and encryption not supported at "
                          "the same time");
             ret = -1;