[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 04/11] block: Use block_job_get() in find_block_j
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v4 04/11] block: Use block_job_get() in find_block_job() |
Date: |
Tue, 5 Jul 2016 17:28:55 +0300 |
find_block_job() looks for a block backend with a specified name,
checks whether it has a block job and acquires its AioContext.
We want to identify jobs by their ID and not by the block backend
they're attached to, so this patch ignores the backends altogether and
gets the job directly. Apart from making the code simpler, this will
allow us to find block jobs once they start having user-specified IDs.
To ensure backward compatibility we keep ERROR_CLASS_DEVICE_NOT_ACTIVE
as the error class if the job doesn't exist. In subsequent patches
we'll also need to keep the device name as the default job ID if the
user doesn't specify a different one.
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
blockdev.c | 40 +++++++++++++---------------------------
1 file changed, 13 insertions(+), 27 deletions(-)
diff --git a/blockdev.c b/blockdev.c
index 3a104a0..f19f3b7 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -3704,42 +3704,28 @@ void qmp_blockdev_mirror(const char *device, const char
*target,
aio_context_release(aio_context);
}
-/* Get the block job for a given device name and acquire its AioContext */
-static BlockJob *find_block_job(const char *device, AioContext **aio_context,
+/* Get a block job using its ID and acquire its AioContext */
+static BlockJob *find_block_job(const char *id, AioContext **aio_context,
Error **errp)
{
- BlockBackend *blk;
- BlockDriverState *bs;
+ BlockJob *job;
+
+ assert(id != NULL);
*aio_context = NULL;
- blk = blk_by_name(device);
- if (!blk) {
- goto notfound;
+ job = block_job_get(id);
+
+ if (!job) {
+ error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
+ "Block job '%s' not found", id);
+ return NULL;
}
- *aio_context = blk_get_aio_context(blk);
+ *aio_context = blk_get_aio_context(job->blk);
aio_context_acquire(*aio_context);
- if (!blk_is_available(blk)) {
- goto notfound;
- }
- bs = blk_bs(blk);
-
- if (!bs->job) {
- goto notfound;
- }
-
- return bs->job;
-
-notfound:
- error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,
- "No active block job on device '%s'", device);
- if (*aio_context) {
- aio_context_release(*aio_context);
- *aio_context = NULL;
- }
- return NULL;
+ return job;
}
void qmp_block_job_set_speed(const char *device, int64_t speed, Error **errp)
--
2.8.1
- [Qemu-devel] [PATCH v4 03/11] blockjob: Add block_job_get(), (continued)
- [Qemu-devel] [PATCH v4 03/11] blockjob: Add block_job_get(), Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 08/11] stream: Add 'job-id' parameter to 'block-stream', Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 05/11] blockjob: Add 'job_id' parameter to block_job_create(), Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 06/11] mirror: Add 'job-id' parameter to 'blockdev-mirror' and 'drive-mirror', Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 01/11] stream: Fix prototype of stream_start(), Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 10/11] qemu-img: Set the ID of the block job in img_commit(), Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 04/11] block: Use block_job_get() in find_block_job(),
Alberto Garcia <=
- [Qemu-devel] [PATCH v4 11/11] blockjob: Update description of the 'device' field in the QMP API, Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 02/11] blockjob: Update description of the 'id' field, Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 09/11] commit: Add 'job-id' parameter to 'block-commit', Alberto Garcia, 2016/07/05
- [Qemu-devel] [PATCH v4 07/11] backup: Add 'job-id' parameter to 'blockdev-backup' and 'drive-backup', Alberto Garcia, 2016/07/05
- Re: [Qemu-devel] [PATCH v4 00/11] Allow creating block jobs with a user-defined ID, Kevin Wolf, 2016/07/07