diff options
| author | Alberto Garcia <berto@igalia.com> | 2016-07-05 17:29:01 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-07-13 13:26:02 +0200 |
| commit | a5d5a3bdbd4bd2ffb27f825dd8a39e1fbaf11ad3 (patch) | |
| tree | f20a62135830444777adf07f270db4adf2dc9a15 | |
| parent | fd62c609edb32ddaafbe84c466dd21603577a46d (diff) | |
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>
| -rw-r--r-- | blockjob.c | 6 | ||||
| -rw-r--r-- | qemu-img.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/blockjob.c b/blockjob.c index 511c0db123..3b9cec7440 100644 --- a/blockjob.c +++ b/blockjob.c @@ -132,12 +132,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver, if (job_id == NULL) { job_id = bdrv_get_device_name(bs); - /* Assign a default ID if the BDS does not have a device - * name. We'll get rid of this soon when we finish extending - * the API of all commands that create block jobs. */ - if (job_id[0] == '\0') { - job_id = "default_job"; - } } if (!id_wellformed(job_id)) { 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; |