[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_active_start |
Date: |
Mon, 24 Apr 2017 09:26:54 +0200 |
From: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
block/mirror.c | 4 ++--
block/replication.c | 2 +-
blockdev.c | 2 +-
include/block/block_int.h | 6 +++---
qemu-img.c | 2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 0c1a56c..9f5eb69 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1290,8 +1290,8 @@ void commit_active_start(const char *job_id,
BlockDriverState *bs,
BlockDriverState *base, int creation_flags,
int64_t speed, BlockdevOnError on_error,
const char *filter_node_name,
- BlockCompletionFunc *cb, void *opaque, Error **errp,
- bool auto_complete)
+ BlockCompletionFunc *cb, void *opaque,
+ bool auto_complete, Error **errp)
{
int orig_base_flags;
Error *local_err = NULL;
diff --git a/block/replication.c b/block/replication.c
index bf3c395..d300c15 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -656,7 +656,7 @@ static void replication_stop(ReplicationState *rs, bool
failover, Error **errp)
s->replication_state = BLOCK_REPLICATION_FAILOVER;
commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs,
BLOCK_JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,
- NULL, replication_done, bs, errp, true);
+ NULL, replication_done, bs, true, errp);
break;
default:
aio_context_release(aio_context);
diff --git a/blockdev.c b/blockdev.c
index 94726ed..6428206 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3142,7 +3142,7 @@ void qmp_block_commit(bool has_job_id, const char
*job_id, const char *device,
}
commit_active_start(has_job_id ? job_id : NULL, bs, base_bs,
BLOCK_JOB_DEFAULT, speed, on_error,
- filter_node_name, NULL, NULL, &local_err, false);
+ filter_node_name, NULL, NULL, false, &local_err);
} else {
BlockDriverState *overlay_bs = bdrv_find_overlay(bs, top_bs);
if (bdrv_op_is_blocked(overlay_bs, BLOCK_OP_TYPE_COMMIT_TARGET, errp))
{
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 59400bd..4f8cd29 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -805,16 +805,16 @@ void commit_start(const char *job_id, BlockDriverState
*bs,
* a node name should be autogenerated.
* @cb: Completion function for the job.
* @opaque: Opaque pointer value passed to @cb.
- * @errp: Error object.
* @auto_complete: Auto complete the job.
+ * @errp: Error object.
*
*/
void commit_active_start(const char *job_id, BlockDriverState *bs,
BlockDriverState *base, int creation_flags,
int64_t speed, BlockdevOnError on_error,
const char *filter_node_name,
- BlockCompletionFunc *cb, void *opaque, Error **errp,
- bool auto_complete);
+ BlockCompletionFunc *cb, void *opaque,
+ bool auto_complete, Error **errp);
/*
* mirror_start:
* @job_id: The id of the newly-created job, or %NULL to use the
diff --git a/qemu-img.c b/qemu-img.c
index 2c09053..bbe1574 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -984,7 +984,7 @@ static int img_commit(int argc, char **argv)
aio_context_acquire(aio_context);
commit_active_start("commit", bs, base_bs, BLOCK_JOB_DEFAULT, 0,
BLOCKDEV_ON_ERROR_REPORT, NULL, common_block_job_cb,
- &cbi, &local_err, false);
+ &cbi, false, &local_err);
aio_context_release(aio_context);
if (local_err) {
goto done;
--
2.7.4
- [Qemu-devel] [PULL 01/15] util/error: Fix leak in error_vprepend(), (continued)
- [Qemu-devel] [PULL 01/15] util/error: Fix leak in error_vprepend(), Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 02/15] socket: Make errp the last parameter of socket_connect, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 15/15] error: Apply error_propagate_null.cocci again, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 07/15] crypto: Make errp the last parameter of functions, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 10/15] nfs: Make errp the last parameter of nfs_client_open, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 04/15] socket: Make errp the last parameter of unix_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 08/15] mirror: Make errp the last parameter of mirror_start_job, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 05/15] socket: Make errp the last parameter of vsock_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 14/15] qga: Make errp the last parameter of qga_vss_fsfreeze, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 11/15] fdc: Make errp the last parameter of fdctrl_connect_drives, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 09/15] block: Make errp the last parameter of commit_active_start,
Markus Armbruster <=
- [Qemu-devel] [PULL 03/15] socket: Make errp the last parameter of inet_connect_saddr, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 06/15] block: Make errp the last parameter of bdrv_img_create, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 13/15] migration: Make errp the last parameter of local functions, Markus Armbruster, 2017/04/24
- [Qemu-devel] [PULL 12/15] scsi: Make errp the last parameter of virtio_scsi_common_realize, Markus Armbruster, 2017/04/24
- Re: [Qemu-devel] [PULL 00/15] Error reporting patches for 2017-04-24, Peter Maydell, 2017/04/24