diff options
| author | Andrey Shinkevich | 2019-02-08 16:06:06 +0100 |
|---|---|---|
| committer | Eric Blake | 2019-02-11 21:35:43 +0100 |
| commit | 1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb (patch) | |
| tree | 08f08b47a4cb5f49ae147eaa7d1f2e7d4347d44b /block/qapi.c | |
| parent | nbd/server: Kill pointless shadowed variable (diff) | |
| download | qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.tar.gz qemu-1bf6e9ca9234e1dbcaa18baa06eca9d55cc2dbbb.tar.xz 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/qapi.c')
| -rw-r--r-- | block/qapi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/block/qapi.c b/block/qapi.c index c66f949db8..00291f9105 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -282,7 +282,12 @@ void bdrv_query_image_info(BlockDriverState *bs, info->dirty_flag = bdi.is_dirty; info->has_dirty_flag = true; } - info->format_specific = bdrv_get_specific_info(bs); + info->format_specific = bdrv_get_specific_info(bs, &err); + if (err) { + error_propagate(errp, err); + qapi_free_ImageInfo(info); + goto out; + } info->has_format_specific = info->format_specific != NULL; backing_filename = bs->backing_file; |