[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/14] mirror: Make errp the last parameter of mirro
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH 07/14] mirror: Make errp the last parameter of mirror_start_job |
Date: |
Fri, 21 Apr 2017 20:27:03 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
block/mirror.c | 13 +++++++------
1 file 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;
--
2.9.3
- [Qemu-devel] [PATCH 02/14] socket: Make errp the last parameter of inet_connect_saddr, (continued)
- [Qemu-devel] [PATCH 02/14] socket: Make errp the last parameter of inet_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 03/14] socket: Make errp the last parameter of unix_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 04/14] socket: Make errp the last parameter of vsock_connect_saddr, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 05/14] block: Make errp the last parameter of bdrv_img_create, Fam Zheng, 2017/04/21
- [Qemu-devel] [PATCH 06/14] crypto: Make errp the last parameter of functions, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 07/14] mirror: Make errp the last parameter of mirror_start_job,
Fam Zheng <=
[Qemu-devel] [PATCH 08/14] block: Make errp the last parameter of commit_active_start, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 09/14] nfs: Make errp the last parameter of nfs_client_open, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 11/14] scsi: Make errp the last parameter of virtio_scsi_common_realize, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 10/14] fdc: Make errp the last parameter of fdctrl_connect_drives, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 12/14] migration: Make errp the last parameter of local functions, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 13/14] qga: Make errp the last parameter of qga_vss_fsfreeze, Fam Zheng, 2017/04/21
[Qemu-devel] [PATCH 14/14] error: Apply error_propagate_null.cocci again, Fam Zheng, 2017/04/21
Re: [Qemu-devel] [PATCH 00/14] Trivial cleanups around error reporting, Eric Blake, 2017/04/21
Re: [Qemu-devel] [PATCH 00/14] Trivial cleanups around error reporting, Markus Armbruster, 2017/04/22
Re: [Qemu-devel] [PATCH 00/14] Trivial cleanups around error reporting, Markus Armbruster, 2017/04/24