diff options
| author | Fam Zheng <famz@redhat.com> | 2017-04-21 20:27:03 +0800 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-04-24 09:13:44 +0200 |
| commit | 51ccfa2dbf4f8ae2e480a7b9c326a7f375217150 (patch) | |
| tree | 45cf9382d808bb0d86781002dce7b3b8fced62f1 /block | |
| parent | 375092332eeaa6e47561ce47fd36144cdaf964d0 (diff) | |
| download | qemu-51ccfa2dbf4f8ae2e480a7b9c326a7f375217150.zip qemu-51ccfa2dbf4f8ae2e480a7b9c326a7f375217150.tar.gz qemu-51ccfa2dbf4f8ae2e480a7b9c326a7f375217150.tar.bz2 | |
mirror: Make errp the last parameter of mirror_start_job
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170421122710.15373-8-famz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/mirror.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/block/mirror.c b/block/mirror.c index 164438f..0c1a56c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -1112,10 +1112,11 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs, BlockdevOnError on_target_error, bool unmap, BlockCompletionFunc *cb, - void *opaque, Error **errp, + void *opaque, const BlockJobDriver *driver, bool is_none_mode, BlockDriverState *base, - bool auto_complete, const char *filter_node_name) + bool auto_complete, const char *filter_node_name, + Error **errp) { MirrorBlockJob *s; BlockDriverState *mirror_top_bs; @@ -1280,9 +1281,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs, base = mode == MIRROR_SYNC_MODE_TOP ? backing_bs(bs) : NULL; mirror_start_job(job_id, bs, BLOCK_JOB_DEFAULT, target, replaces, speed, granularity, buf_size, backing_mode, - on_source_error, on_target_error, unmap, NULL, NULL, errp, + on_source_error, on_target_error, unmap, NULL, NULL, &mirror_job_driver, is_none_mode, base, false, - filter_node_name); + filter_node_name, errp); } void commit_active_start(const char *job_id, BlockDriverState *bs, @@ -1303,9 +1304,9 @@ void commit_active_start(const char *job_id, BlockDriverState *bs, mirror_start_job(job_id, bs, creation_flags, base, NULL, speed, 0, 0, MIRROR_LEAVE_BACKING_CHAIN, - on_error, on_error, true, cb, opaque, &local_err, + on_error, on_error, true, cb, opaque, &commit_active_job_driver, false, base, auto_complete, - filter_node_name); + filter_node_name, &local_err); if (local_err) { error_propagate(errp, local_err); goto error_restore_flags; |