block: deprecate "encryption=on" in favor of "encrypt.format=aes"
commit0cb8d47ba94c0e16f22e3e385dc7c60aea852eee
authorDaniel P. Berrange <berrange@redhat.com>
Fri, 23 Jun 2017 16:24:06 +0000 (23 17:24 +0100)
committerMax Reitz <mreitz@redhat.com>
Tue, 11 Jul 2017 15:44:55 +0000 (11 17:44 +0200)
tree5e2fbf1e55de0ad6a6959fcf2804277d91dcd8b5
parent06af39ecf9da95bbd6dd38e86b15dbc042a6e09c
block: deprecate "encryption=on" in favor of "encrypt.format=aes"

Historically the qcow & qcow2 image formats supported a property
"encryption=on" to enable their built-in AES encryption. We'll
soon be supporting LUKS for qcow2, so need a more general purpose
way to enable encryption, with a choice of formats.

This introduces an "encrypt.format" option, which will later be
joined by a number of other "encrypt.XXX" options. The use of
a "encrypt." prefix instead of "encrypt-" is done to facilitate
mapping to a nested QAPI schema at later date.

e.g. the preferred syntax is now

  qemu-img create -f qcow2 -o encrypt.format=aes demo.qcow2

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170623162419.26068-8-berrange@redhat.com
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
block/qcow.c
block/qcow2.c
include/block/block_int.h
qemu-img.c
tests/qemu-iotests/049.out
tests/qemu-iotests/082.out
tests/qemu-iotests/085.out
tests/qemu-iotests/144.out
tests/qemu-iotests/185.out