[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 15/33] job: Add Job.aio_context
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 15/33] job: Add Job.aio_context |
Date: |
Tue, 24 Apr 2018 17:24:57 +0200 |
When block jobs need an AioContext, they just take it from their main
block node. Generic jobs don't have a main block node, so we need to
assign them an AioContext explicitly.
Signed-off-by: Kevin Wolf <address@hidden>
---
include/qemu/job.h | 7 ++++++-
blockjob.c | 5 ++++-
job.c | 4 +++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/include/qemu/job.h b/include/qemu/job.h
index 741bf2628d..c1882bb0dd 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -47,6 +47,9 @@ typedef struct Job {
/** Current state; See @JobStatus for details. */
JobStatus status;
+ /** AioContext to run the job coroutine in */
+ AioContext *aio_context;
+
/**
* Set to true if the job should cancel itself. The flag must
* always be tested just before toggling the busy flag from false
@@ -79,9 +82,11 @@ struct JobDriver {
*
* @job_id: The id of the newly-created job, or %NULL for internal jobs
* @driver: The class object for the newly-created job.
+ * @ctx: The AioContext to run the job coroutine in.
* @errp: Error object.
*/
-void *job_create(const char *job_id, const JobDriver *driver, Error **errp);
+void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
+ Error **errp);
/**
* Add a reference to Job refcnt, it will be decreased with job_unref, and then
diff --git a/blockjob.c b/blockjob.c
index d7d9744db7..734dd168dd 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -203,6 +203,7 @@ static void block_job_attached_aio_context(AioContext
*new_context,
{
BlockJob *job = opaque;
+ job->job.aio_context = new_context;
if (job->driver->attached_aio_context) {
job->driver->attached_aio_context(job, new_context);
}
@@ -234,6 +235,7 @@ static void block_job_detach_aio_context(void *opaque)
block_job_drain(job);
}
+ job->job.aio_context = NULL;
job_unref(&job->job);
}
@@ -890,7 +892,8 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
return NULL;
}
- job = job_create(job_id, &driver->job_driver, errp);
+ job = job_create(job_id, &driver->job_driver, blk_get_aio_context(blk),
+ errp);
if (job == NULL) {
blk_unref(blk);
return NULL;
diff --git a/job.c b/job.c
index f7b9ef9e4b..a28a7765e5 100644
--- a/job.c
+++ b/job.c
@@ -122,7 +122,8 @@ Job *job_get(const char *id)
return NULL;
}
-void *job_create(const char *job_id, const JobDriver *driver, Error **errp)
+void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
+ Error **errp)
{
Job *job;
@@ -141,6 +142,7 @@ void *job_create(const char *job_id, const JobDriver
*driver, Error **errp)
job->driver = driver;
job->id = g_strdup(job_id);
job->refcnt = 1;
+ job->aio_context = ctx;
job_state_transition(job, JOB_STATUS_CREATED);
--
2.13.6
- [Qemu-block] [RFC PATCH 02/33] blockjob: Move RateLimit to BlockJob, (continued)
- [Qemu-block] [RFC PATCH 02/33] blockjob: Move RateLimit to BlockJob, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 03/33] blockjob: Implement block_job_set_speed() centrally, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 04/33] blockjob: Introduce block_job_ratelimit_get_delay(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 05/33] blockjob: Add block_job_driver(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 06/33] blockjob: Remove block_job_pause/resume_all(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 10/33] job: Add job_delete(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 09/33] job: Add JobDriver.job_type, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 08/33] job: Rename BlockJobType into JobType, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 11/33] job: Maintain a list of all jobs, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 07/33] job: Create Job, JobDriver and job_create(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 15/33] job: Add Job.aio_context,
Kevin Wolf <=
- [Qemu-block] [RFC PATCH 12/33] job: Move state transitions to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 14/33] job: Move cancelled to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 13/33] job: Add reference counting, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 16/33] job: Move defer_to_main_loop to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 18/33] job: Add job_sleep_ns(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 20/33] job: Replace BlockJob.completed with job_is_completed(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 22/33] blockjob: Split block_job_event_pending(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 23/33] job: Add job_event_*(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 19/33] job: Move pause/resume functions to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 17/33] job: Move coroutine and related code to Job, Kevin Wolf, 2018/04/24