commit 8b13976d3fabee2f2900a9fb51c85b27ba4516b9
author Max Reitz <mreitz@redhat.com> Mon Jul 27 17:51:32 2015 +0200
committer Kevin Wolf <kwolf@redhat.com> Fri Dec 18 14:34:43 2015 +0100
tree 594512dd25c37bcb5880b6b4acff0c4f6dc05e37
parent bd5072d75622c3a702741064df87ea8911bae1a4

block: Add opaque value to the amend CB

Add an opaque value which is to be passed to the bdrv_amend_options()
status callback.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index 033011c..b6b4c9e 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2896,7 +2896,8 @@
 }
 
 static void amend_status_cb(BlockDriverState *bs,
-                            int64_t offset, int64_t total_work_size)
+                            int64_t offset, int64_t total_work_size,
+                            void *opaque)
 {
     qemu_progress_print(100.f * offset / total_work_size, 0);
 }
@@ -3020,7 +3021,7 @@
 
     /* In case the driver does not call amend_status_cb() */
     qemu_progress_print(0.f, 0);
-    ret = bdrv_amend_options(bs, opts, &amend_status_cb);
+    ret = bdrv_amend_options(bs, opts, &amend_status_cb, NULL);
     qemu_progress_print(100.f, 0);
     if (ret < 0) {
         error_report("Error while amending options: %s", strerror(-ret));