summary refs log tree commit diff stats
path: root/qemu-img.c
diff options
context:
space:
mode:
authorAlberto Garcia <berto@igalia.com>2016-07-05 17:29:01 +0300
committerKevin Wolf <kwolf@redhat.com>2016-07-13 13:26:02 +0200
commita5d5a3bdbd4bd2ffb27f825dd8a39e1fbaf11ad3 (patch)
treef20a62135830444777adf07f270db4adf2dc9a15 /qemu-img.c
parentfd62c609edb32ddaafbe84c466dd21603577a46d (diff)
downloadfocaccia-qemu-a5d5a3bdbd4bd2ffb27f825dd8a39e1fbaf11ad3.tar.gz
focaccia-qemu-a5d5a3bdbd4bd2ffb27f825dd8a39e1fbaf11ad3.zip
qemu-img: Set the ID of the block job in img_commit()
img_commit() creates a block job without an ID. This is no longer
allowed now that we require it to be unique and well-formed. We were
solving this by having a fallback in block_job_create(), but now that
we extended the API of commit_active_start() we can finally set an
explicit ID and revert that change.

Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c
index a162f34130..969edce186 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -920,7 +920,7 @@ static int img_commit(int argc, char **argv)
         .bs   = bs,
     };
 
-    commit_active_start(NULL, bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
+    commit_active_start("commit", bs, base_bs, 0, BLOCKDEV_ON_ERROR_REPORT,
                         common_block_job_cb, &cbi, &local_err);
     if (local_err) {
         goto done;