[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 38/40] blockjob: Remove BlockJob.driver
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH v2 38/40] blockjob: Remove BlockJob.driver |
Date: |
Fri, 18 May 2018 15:21:12 +0200 |
BlockJob.driver is redundant with Job.driver and only used in very few
places any more. Remove it.
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/blockjob.h | 3 ---
blockjob.c | 17 ++++++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/block/blockjob.h b/include/block/blockjob.h
index 3021d11126..32c00b7dc0 100644
--- a/include/block/blockjob.h
+++ b/include/block/blockjob.h
@@ -43,9 +43,6 @@ typedef struct BlockJob {
/** Data belonging to the generic Job infrastructure */
Job job;
- /** The job type, including the job vtable. */
- const BlockJobDriver *driver;
-
/** The block device on which the job is operating. */
BlockBackend *blk;
diff --git a/blockjob.c b/blockjob.c
index 5c8ff6f846..0306533a2e 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -103,10 +103,12 @@ static void block_job_attached_aio_context(AioContext
*new_context,
void *opaque)
{
BlockJob *job = opaque;
+ const JobDriver *drv = job->job.driver;
+ BlockJobDriver *bjdrv = container_of(drv, BlockJobDriver, job_driver);
job->job.aio_context = new_context;
- if (job->driver->attached_aio_context) {
- job->driver->attached_aio_context(job, new_context);
+ if (bjdrv->attached_aio_context) {
+ bjdrv->attached_aio_context(job, new_context);
}
job_resume(&job->job);
@@ -115,10 +117,12 @@ static void block_job_attached_aio_context(AioContext
*new_context,
void block_job_drain(Job *job)
{
BlockJob *bjob = container_of(job, BlockJob, job);
+ const JobDriver *drv = job->driver;
+ BlockJobDriver *bjdrv = container_of(drv, BlockJobDriver, job_driver);
blk_drain(bjob->blk);
- if (bjob->driver->drain) {
- bjob->driver->drain(bjob);
+ if (bjdrv->drain) {
+ bjdrv->drain(bjob);
}
}
@@ -201,7 +205,7 @@ bool block_job_is_internal(BlockJob *job)
const BlockJobDriver *block_job_driver(BlockJob *job)
{
- return job->driver;
+ return container_of(job->job.driver, BlockJobDriver, job_driver);
}
/* Assumes the job_mutex is held */
@@ -386,8 +390,7 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
assert(job->job.driver->user_resume == &block_job_user_resume);
assert(job->job.driver->drain == &block_job_drain);
- job->driver = driver;
- job->blk = blk;
+ job->blk = blk;
job->finalize_cancelled_notifier.notify = block_job_event_cancelled;
job->finalize_completed_notifier.notify = block_job_event_completed;
--
2.13.6
- [Qemu-block] [PATCH v2 30/40] job: Add job_dismiss(), (continued)
- [Qemu-block] [PATCH v2 30/40] job: Add job_dismiss(), Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 32/40] job: Add job_transition_to_ready(), Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 34/40] job: Introduce qapi/job.json, Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 33/40] job: Move progress fields to Job, Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 39/40] iotests: Move qmp_to_opts() to VM, Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 37/40] job: Add query-jobs QMP command, Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 38/40] blockjob: Remove BlockJob.driver,
Kevin Wolf <=
- [Qemu-block] [PATCH v2 36/40] job: Add lifecycle QMP commands, Kevin Wolf, 2018/05/18
- [Qemu-block] [PATCH v2 35/40] job: Add JOB_STATUS_CHANGE QMP event, Kevin Wolf, 2018/05/18