diff options
| author | Max Reitz | 2018-05-09 23:00:18 +0200 |
|---|---|---|
| committer | Max Reitz | 2018-06-11 16:18:45 +0200 |
| commit | d1402b502691142b9cebadd5cb993dc8858e9071 (patch) | |
| tree | cc720c7a6ec91715d85e85ce0fb3ba83ce9155a0 /include | |
| parent | qemu-img: Amendment support implies create_opts (diff) | |
| download | qemu-d1402b502691142b9cebadd5cb993dc8858e9071.tar.gz qemu-d1402b502691142b9cebadd5cb993dc8858e9071.tar.xz qemu-d1402b502691142b9cebadd5cb993dc8858e9071.zip | |
block: Add Error parameter to bdrv_amend_options
Looking at the qcow2 code that is riddled with error_report() calls,
this is really how it should have been from the start.
Along the way, turn the target_version/current_version comparisons at
the beginning of qcow2_downgrade() into assertions (the caller has to
make sure these conditions are met), and rephrase the error message on
using compat=1.1 to get refcount widths other than 16 bits.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20180509210023.20283-3-mreitz@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block.h | 3 | ||||
| -rw-r--r-- | include/block/block_int.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/block/block.h b/include/block/block.h index 6cc6c7e699..4dd4f1eab2 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -343,7 +343,8 @@ int bdrv_check(BlockDriverState *bs, BdrvCheckResult *res, BdrvCheckMode fix); typedef void BlockDriverAmendStatusCB(BlockDriverState *bs, int64_t offset, int64_t total_work_size, void *opaque); int bdrv_amend_options(BlockDriverState *bs_new, QemuOpts *opts, - BlockDriverAmendStatusCB *status_cb, void *cb_opaque); + BlockDriverAmendStatusCB *status_cb, void *cb_opaque, + Error **errp); /* external snapshots */ bool bdrv_recurse_is_first_non_filter(BlockDriverState *bs, diff --git a/include/block/block_int.h b/include/block/block_int.h index 888b7f7bff..327e478a73 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -353,7 +353,8 @@ struct BlockDriver { int (*bdrv_amend_options)(BlockDriverState *bs, QemuOpts *opts, BlockDriverAmendStatusCB *status_cb, - void *cb_opaque); + void *cb_opaque, + Error **errp); void (*bdrv_debug_event)(BlockDriverState *bs, BlkdebugEvent event); |