aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-04-17 13:49:33 +0200
committerKevin Wolf <kwolf@redhat.com>2018-05-23 14:30:49 +0200
commit08be6fe26f6c76d900fc987f58d322b94bc4e248 (patch)
treebd98a75c6e330ba806ea7517509e9c166f0be5fa
parentdaa7f2f9467bc5624f04f28d4b01b88f08c6589c (diff)
downloadqemu-08be6fe26f6c76d900fc987f58d322b94bc4e248.zip
qemu-08be6fe26f6c76d900fc987f58d322b94bc4e248.tar.gz
qemu-08be6fe26f6c76d900fc987f58d322b94bc4e248.tar.bz2
job: Add Job.aio_context
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 <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
-rw-r--r--blockjob.c5
-rw-r--r--include/qemu/job.h7
-rw-r--r--job.c4
3 files changed, 13 insertions, 3 deletions
diff --git a/blockjob.c b/blockjob.c
index f4f9956..0a0b1c4 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -216,6 +216,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);
}
@@ -247,6 +248,7 @@ static void block_job_detach_aio_context(void *opaque)
block_job_drain(job);
}
+ job->job.aio_context = NULL;
job_unref(&job->job);
}
@@ -899,7 +901,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/include/qemu/job.h b/include/qemu/job.h
index 5dfbec5..01e083f 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/job.c b/job.c
index 1abca6a..01074d0 100644
--- a/job.c
+++ b/job.c
@@ -121,7 +121,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;
@@ -140,6 +141,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);