[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 10/34] qemu-img: Set the ID of the block job in im
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL v2 10/34] qemu-img: Set the ID of the block job in img_commit() |
Date: |
Wed, 13 Jul 2016 14:50:17 +0200 |
From: Alberto Garcia <address@hidden>
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 <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
blockjob.c | 6 ------
qemu-img.c | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index 511c0db..3b9cec7 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 a162f34..969edce 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;
--
1.8.3.1
- [Qemu-devel] [PULL v2 00/34] Block layer patches, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 03/34] blockjob: Add block_job_get(), Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 02/34] blockjob: Update description of the 'id' field, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 04/34] block: Use block_job_get() in find_block_job(), Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 01/34] stream: Fix prototype of stream_start(), Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 06/34] mirror: Add 'job-id' parameter to 'blockdev-mirror' and 'drive-mirror', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 07/34] backup: Add 'job-id' parameter to 'blockdev-backup' and 'drive-backup', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 08/34] stream: Add 'job-id' parameter to 'block-stream', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 10/34] qemu-img: Set the ID of the block job in img_commit(),
Kevin Wolf <=
- [Qemu-devel] [PULL v2 05/34] blockjob: Add 'job_id' parameter to block_job_create(), Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 13/34] raw-posix: Use qemu_dup, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 11/34] blockjob: Update description of the 'device' field in the QMP API, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 12/34] osdep: Introduce qemu_dup, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 15/34] test-coroutine: prepare for the next patch, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 09/34] commit: Add 'job-id' parameter to 'block-commit', Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 17/34] block/qdev: Allow node name for drive properties, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 19/34] commit: Fix use of error handling policy, Kevin Wolf, 2016/07/13
- [Qemu-devel] [PULL v2 14/34] coroutine: use QSIMPLEQ instead of QTAILQ, Kevin Wolf, 2016/07/13