diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-06-26 19:41:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-06-29 14:20:56 +0200 |
| commit | 796d32394516d624986e9275f56bfcbffe945491 (patch) | |
| tree | fb1c30c32d9da335a8a72a761e9ab130aeb1bebf /block/qcow2.c | |
| parent | 37aec7d75eb0d035a0db4f2cf9ad8b1b0c10f91b (diff) | |
| download | qemu-796d32394516d624986e9275f56bfcbffe945491.zip qemu-796d32394516d624986e9275f56bfcbffe945491.tar.gz qemu-796d32394516d624986e9275f56bfcbffe945491.tar.bz2 | |
block/crypto: Simplify block_crypto_{open,create}_opts_init()
block_crypto_open_opts_init() and block_crypto_create_opts_init()
contain a virtual visit of QCryptoBlockOptions and
QCryptoBlockCreateOptions less member "format", respectively.
Change their callers to put member "format" in the QDict, so they can
use the generated visitors for these types instead.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 2d190aa..78aeb1f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -1040,9 +1040,8 @@ static int qcow2_update_options_prepare(BlockDriverState *bs, ret = -EINVAL; goto fail; } - qdict_del(encryptopts, "format"); - r->crypto_opts = block_crypto_open_opts_init( - Q_CRYPTO_BLOCK_FORMAT_QCOW, encryptopts, errp); + qdict_put_str(encryptopts, "format", "qcow"); + r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp); break; case QCOW_CRYPT_LUKS: @@ -1053,9 +1052,8 @@ static int qcow2_update_options_prepare(BlockDriverState *bs, ret = -EINVAL; goto fail; } - qdict_del(encryptopts, "format"); - r->crypto_opts = block_crypto_open_opts_init( - Q_CRYPTO_BLOCK_FORMAT_LUKS, encryptopts, errp); + qdict_put_str(encryptopts, "format", "luks"); + r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp); break; default: |