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/qcow2.c | |
| parent | 269ee27e99cfbff983a9ab067ae22f6182f11fe2 (diff) | |
| download | qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.zip | |
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/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 8c91b92865..bcb80d0270 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4368,14 +4368,20 @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) return 0; } -static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) +static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs, + Error **errp) { BDRVQcow2State *s = bs->opaque; ImageInfoSpecific *spec_info; QCryptoBlockInfo *encrypt_info = NULL; + Error *local_err = NULL; if (s->crypto != NULL) { - encrypt_info = qcrypto_block_get_info(s->crypto, &error_abort); + encrypt_info = qcrypto_block_get_info(s->crypto, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return NULL; + } } spec_info = g_new(ImageInfoSpecific, 1); |