[08/14] block: Make errp the last parameter of commit_active_start

Message ID 20170421122710.15373-9-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng April 21, 2017, 12:27 p.m.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 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(-)

Patch

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;