diff options
| author | Andrey Shinkevich <andrey.shinkevich@virtuozzo.com> | 2019-02-08 18:06:06 +0300 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2019-02-11 14:35:43 -0600 |
| commit | 1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb (patch) | |
| tree | 08f08b47a4cb5f49ae147eaa7d1f2e7d4347d44b /block/crypto.c | |
| parent | 269ee27e99cfbff983a9ab067ae22f6182f11fe2 (diff) | |
| download | qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.zip qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.tar.gz qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.tar.bz2 | |
bdrv_query_image_info Error parameter added
Inform a user in case qcow2_get_specific_info fails to obtain
QCOW2 image specific information. This patch is preliminary to
the one "qcow2: Add list of bitmaps to ImageInfoSpecificQCow2".
Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1549638368-530182-2-git-send-email-andrey.shinkevich@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/crypto.c')
| -rw-r--r-- | block/crypto.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/block/crypto.c b/block/crypto.c index f0a5f6b..d5b1da6 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -594,20 +594,17 @@ static int block_crypto_get_info_luks(BlockDriverState *bs, } static ImageInfoSpecific * -block_crypto_get_specific_info_luks(BlockDriverState *bs) +block_crypto_get_specific_info_luks(BlockDriverState *bs, Error **errp) { BlockCrypto *crypto = bs->opaque; ImageInfoSpecific *spec_info; QCryptoBlockInfo *info; - info = qcrypto_block_get_info(crypto->block, NULL); + info = qcrypto_block_get_info(crypto->block, errp); if (!info) { return NULL; } - if (info->format != Q_CRYPTO_BLOCK_FORMAT_LUKS) { - qapi_free_QCryptoBlockInfo(info); - return NULL; - } + assert(info->format == Q_CRYPTO_BLOCK_FORMAT_LUKS); spec_info = g_new(ImageInfoSpecific, 1); spec_info->type = IMAGE_INFO_SPECIFIC_KIND_LUKS; |