Received: from eggs.gnu.org ([209.51.188.92]:38298) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grTIn-00008U-RR for qemu-devel@nongnu.org; Wed, 06 Feb 2019 14:56:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grTIn-0007zA-1y for qemu-devel@nongnu.org; Wed, 06 Feb 2019 14:56:09 -0500 From: Max Reitz Date: Wed, 6 Feb 2019 20:55:48 +0100 Message-Id: <20190206195551.28893-6-mreitz@redhat.com> In-Reply-To: <20190206195551.28893-1-mreitz@redhat.com> References: <20190206195551.28893-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 5/8] qapi: Formalize qcow encryption probing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Eric Blake , Markus Armbruster , Michael Roth , Kevin Wolf qcow only supports a single encryption (and there is no reason why that would change in the future), so we can make it the default. Signed-off-by: Max Reitz Reviewed-by: Eric Blake Reviewed-by: Daniel P. Berrang=C3=A9 --- qapi/block-core.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index abf9af0c4d..8e193fe71f 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2939,8 +2939,9 @@ # Since: 2.10 ## { 'union': 'BlockdevQcowEncryption', - 'base': { 'format': 'BlockdevQcowEncryptionFormat' }, + 'base': { '*format': 'BlockdevQcowEncryptionFormat' }, 'discriminator': 'format', + 'default-variant': 'aes', 'data': { 'aes': 'QCryptoBlockOptionsQCow' } } =20 ## --=20 2.20.1