|
 |
26ba25 |
From 7d49650cc825e639180ba1d7580e15cf56fb21da Mon Sep 17 00:00:00 2001
|
|
|
26ba25 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Date: Tue, 26 Jun 2018 09:48:07 +0200
|
|
|
26ba25 |
Subject: [PATCH 099/268] job: Add Job.aio_context
|
|
|
26ba25 |
|
|
|
26ba25 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Message-id: <20180626094856.6924-25-kwolf@redhat.com>
|
|
|
26ba25 |
Patchwork-id: 81075
|
|
|
26ba25 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 24/73] job: Add Job.aio_context
|
|
|
26ba25 |
Bugzilla: 1513543
|
|
|
26ba25 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
26ba25 |
|
|
|
26ba25 |
When block jobs need an AioContext, they just take it from their main
|
|
|
26ba25 |
block node. Generic jobs don't have a main block node, so we need to
|
|
|
26ba25 |
assign them an AioContext explicitly.
|
|
|
26ba25 |
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
26ba25 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
26ba25 |
(cherry picked from commit 08be6fe26f6c76d900fc987f58d322b94bc4e248)
|
|
|
26ba25 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
26ba25 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
26ba25 |
---
|
|
|
26ba25 |
blockjob.c | 5 ++++-
|
|
|
26ba25 |
include/qemu/job.h | 7 ++++++-
|
|
|
26ba25 |
job.c | 4 +++-
|
|
|
26ba25 |
3 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
26ba25 |
|
|
|
26ba25 |
diff --git a/blockjob.c b/blockjob.c
|
|
|
26ba25 |
index f4f9956..0a0b1c4 100644
|
|
|
26ba25 |
--- a/blockjob.c
|
|
|
26ba25 |
+++ b/blockjob.c
|
|
|
26ba25 |
@@ -216,6 +216,7 @@ static void block_job_attached_aio_context(AioContext *new_context,
|
|
|
26ba25 |
{
|
|
|
26ba25 |
BlockJob *job = opaque;
|
|
|
26ba25 |
|
|
|
26ba25 |
+ job->job.aio_context = new_context;
|
|
|
26ba25 |
if (job->driver->attached_aio_context) {
|
|
|
26ba25 |
job->driver->attached_aio_context(job, new_context);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
@@ -247,6 +248,7 @@ static void block_job_detach_aio_context(void *opaque)
|
|
|
26ba25 |
block_job_drain(job);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
+ job->job.aio_context = NULL;
|
|
|
26ba25 |
job_unref(&job->job);
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -899,7 +901,8 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
|
|
|
26ba25 |
return NULL;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
- job = job_create(job_id, &driver->job_driver, errp);
|
|
|
26ba25 |
+ job = job_create(job_id, &driver->job_driver, blk_get_aio_context(blk),
|
|
|
26ba25 |
+ errp);
|
|
|
26ba25 |
if (job == NULL) {
|
|
|
26ba25 |
blk_unref(blk);
|
|
|
26ba25 |
return NULL;
|
|
|
26ba25 |
diff --git a/include/qemu/job.h b/include/qemu/job.h
|
|
|
26ba25 |
index 5dfbec5..01e083f 100644
|
|
|
26ba25 |
--- a/include/qemu/job.h
|
|
|
26ba25 |
+++ b/include/qemu/job.h
|
|
|
26ba25 |
@@ -47,6 +47,9 @@ typedef struct Job {
|
|
|
26ba25 |
/** Current state; See @JobStatus for details. */
|
|
|
26ba25 |
JobStatus status;
|
|
|
26ba25 |
|
|
|
26ba25 |
+ /** AioContext to run the job coroutine in */
|
|
|
26ba25 |
+ AioContext *aio_context;
|
|
|
26ba25 |
+
|
|
|
26ba25 |
/**
|
|
|
26ba25 |
* Set to true if the job should cancel itself. The flag must
|
|
|
26ba25 |
* always be tested just before toggling the busy flag from false
|
|
|
26ba25 |
@@ -79,9 +82,11 @@ struct JobDriver {
|
|
|
26ba25 |
*
|
|
|
26ba25 |
* @job_id: The id of the newly-created job, or %NULL for internal jobs
|
|
|
26ba25 |
* @driver: The class object for the newly-created job.
|
|
|
26ba25 |
+ * @ctx: The AioContext to run the job coroutine in.
|
|
|
26ba25 |
* @errp: Error object.
|
|
|
26ba25 |
*/
|
|
|
26ba25 |
-void *job_create(const char *job_id, const JobDriver *driver, Error **errp);
|
|
|
26ba25 |
+void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
|
|
|
26ba25 |
+ Error **errp);
|
|
|
26ba25 |
|
|
|
26ba25 |
/**
|
|
|
26ba25 |
* Add a reference to Job refcnt, it will be decreased with job_unref, and then
|
|
|
26ba25 |
diff --git a/job.c b/job.c
|
|
|
26ba25 |
index 1abca6a..01074d0 100644
|
|
|
26ba25 |
--- a/job.c
|
|
|
26ba25 |
+++ b/job.c
|
|
|
26ba25 |
@@ -121,7 +121,8 @@ Job *job_get(const char *id)
|
|
|
26ba25 |
return NULL;
|
|
|
26ba25 |
}
|
|
|
26ba25 |
|
|
|
26ba25 |
-void *job_create(const char *job_id, const JobDriver *driver, Error **errp)
|
|
|
26ba25 |
+void *job_create(const char *job_id, const JobDriver *driver, AioContext *ctx,
|
|
|
26ba25 |
+ Error **errp)
|
|
|
26ba25 |
{
|
|
|
26ba25 |
Job *job;
|
|
|
26ba25 |
|
|
|
26ba25 |
@@ -140,6 +141,7 @@ void *job_create(const char *job_id, const JobDriver *driver, Error **errp)
|
|
|
26ba25 |
job->driver = driver;
|
|
|
26ba25 |
job->id = g_strdup(job_id);
|
|
|
26ba25 |
job->refcnt = 1;
|
|
|
26ba25 |
+ job->aio_context = ctx;
|
|
|
26ba25 |
|
|
|
26ba25 |
job_state_transition(job, JOB_STATUS_CREATED);
|
|
|
26ba25 |
|
|
|
26ba25 |
--
|
|
|
26ba25 |
1.8.3.1
|
|
|
26ba25 |
|