[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 09/33] job: Add JobDriver.job_type
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 09/33] job: Add JobDriver.job_type |
Date: |
Tue, 24 Apr 2018 17:24:51 +0200 |
This moves the job_type field from BlockJobDriver to JobDriver.
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/blockjob_int.h | 3 ---
include/qemu/job.h | 11 +++++++++++
block/backup.c | 2 +-
block/commit.c | 2 +-
block/mirror.c | 4 ++--
block/stream.c | 2 +-
blockjob.c | 16 +++++++---------
job.c | 10 ++++++++++
8 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index 3dddd54d43..699a6d1487 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -38,9 +38,6 @@ struct BlockJobDriver {
/** Generic JobDriver callbacks and settings */
JobDriver job_driver;
- /** String describing the operation, part of query-block-jobs QMP API */
- JobType job_type;
-
/** Mandatory: Entrypoint for the Coroutine. */
CoroutineEntry *start;
diff --git a/include/qemu/job.h b/include/qemu/job.h
index b4b49f19e1..c87e951c8a 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -26,6 +26,8 @@
#ifndef JOB_H
#define JOB_H
+#include "qapi/qapi-types-block-core.h"
+
typedef struct JobDriver JobDriver;
/**
@@ -45,6 +47,9 @@ typedef struct Job {
struct JobDriver {
/** Derived Job struct size */
size_t instance_size;
+
+ /** Enum describing the operation */
+ JobType job_type;
};
@@ -57,4 +62,10 @@ struct JobDriver {
*/
void *job_create(const char *job_id, const JobDriver *driver, Error **errp);
+/** Returns the JobType of a given Job. */
+JobType job_type(Job *job);
+
+/** Returns the enum string for the JobType of a given Job. */
+const char *job_type_str(Job *job);
+
#endif
diff --git a/block/backup.c b/block/backup.c
index 1a23e6fb63..780c2bde90 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -525,8 +525,8 @@ static void coroutine_fn backup_run(void *opaque)
static const BlockJobDriver backup_job_driver = {
.job_driver = {
.instance_size = sizeof(BackupBlockJob),
+ .job_type = JOB_TYPE_BACKUP,
},
- .job_type = JOB_TYPE_BACKUP,
.start = backup_run,
.commit = backup_commit,
.abort = backup_abort,
diff --git a/block/commit.c b/block/commit.c
index afa2b2bacf..32d29c890e 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -217,8 +217,8 @@ out:
static const BlockJobDriver commit_job_driver = {
.job_driver = {
.instance_size = sizeof(CommitBlockJob),
+ .job_type = JOB_TYPE_COMMIT,
},
- .job_type = JOB_TYPE_COMMIT,
.start = commit_run,
};
diff --git a/block/mirror.c b/block/mirror.c
index 8cf275d87f..2c014a2b96 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -984,8 +984,8 @@ static void mirror_drain(BlockJob *job)
static const BlockJobDriver mirror_job_driver = {
.job_driver = {
.instance_size = sizeof(MirrorBlockJob),
+ .job_type = JOB_TYPE_MIRROR,
},
- .job_type = JOB_TYPE_MIRROR,
.start = mirror_run,
.complete = mirror_complete,
.pause = mirror_pause,
@@ -996,8 +996,8 @@ static const BlockJobDriver mirror_job_driver = {
static const BlockJobDriver commit_active_job_driver = {
.job_driver = {
.instance_size = sizeof(MirrorBlockJob),
+ .job_type = JOB_TYPE_COMMIT,
},
- .job_type = JOB_TYPE_COMMIT,
.start = mirror_run,
.complete = mirror_complete,
.pause = mirror_pause,
diff --git a/block/stream.c b/block/stream.c
index 048bceb5d0..cb723f190a 100644
--- a/block/stream.c
+++ b/block/stream.c
@@ -211,8 +211,8 @@ out:
static const BlockJobDriver stream_job_driver = {
.job_driver = {
.instance_size = sizeof(StreamBlockJob),
+ .job_type = JOB_TYPE_STREAM,
},
- .job_type = JOB_TYPE_STREAM,
.start = stream_run,
};
diff --git a/blockjob.c b/blockjob.c
index dad6e509f0..5e766057e1 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -295,9 +295,7 @@ static void block_job_detach_aio_context(void *opaque)
static char *child_job_get_parent_desc(BdrvChild *c)
{
BlockJob *job = c->opaque;
- return g_strdup_printf("%s job '%s'",
- JobType_str(job->driver->job_type),
- job->job.id);
+ return g_strdup_printf("%s job '%s'", job_type_str(&job->job),
job->job.id);
}
static void child_job_drained_begin(BdrvChild *c)
@@ -839,7 +837,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
return NULL;
}
info = g_new0(BlockJobInfo, 1);
- info->type = g_strdup(JobType_str(job->driver->job_type));
+ info->type = g_strdup(job_type_str(&job->job));
info->device = g_strdup(job->job.id);
info->len = job->len;
info->busy = atomic_read(&job->busy);
@@ -868,7 +866,7 @@ static void block_job_event_cancelled(BlockJob *job)
return;
}
- qapi_event_send_block_job_cancelled(job->driver->job_type,
+ qapi_event_send_block_job_cancelled(job_type(&job->job),
job->job.id,
job->len,
job->offset,
@@ -882,7 +880,7 @@ static void block_job_event_completed(BlockJob *job, const
char *msg)
return;
}
- qapi_event_send_block_job_completed(job->driver->job_type,
+ qapi_event_send_block_job_completed(job_type(&job->job),
job->job.id,
job->len,
job->offset,
@@ -896,7 +894,7 @@ static int block_job_event_pending(BlockJob *job)
{
block_job_state_transition(job, BLOCK_JOB_STATUS_PENDING);
if (!job->auto_finalize && !block_job_is_internal(job)) {
- qapi_event_send_block_job_pending(job->driver->job_type,
+ qapi_event_send_block_job_pending(job_type(&job->job),
job->job.id,
&error_abort);
}
@@ -970,7 +968,7 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
block_job_sleep_timer_cb, job);
error_setg(&job->blocker, "block device is in use by block job: %s",
- JobType_str(driver->job_type));
+ job_type_str(&job->job));
block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
bs->job = job;
@@ -1174,7 +1172,7 @@ void block_job_event_ready(BlockJob *job)
return;
}
- qapi_event_send_block_job_ready(job->driver->job_type,
+ qapi_event_send_block_job_ready(job_type(&job->job),
job->job.id,
job->len,
job->offset,
diff --git a/job.c b/job.c
index 87fd48468c..f00f401502 100644
--- a/job.c
+++ b/job.c
@@ -29,6 +29,16 @@
#include "qemu/job.h"
#include "qemu/id.h"
+JobType job_type(Job *job)
+{
+ return job->driver->job_type;
+}
+
+const char *job_type_str(Job *job)
+{
+ return JobType_str(job_type(job));
+}
+
void *job_create(const char *job_id, const JobDriver *driver, Error **errp)
{
Job *job;
--
2.13.6
- Re: [Qemu-block] [Qemu-devel] [RFC PATCH 02/33] blockjob: Move RateLimit to BlockJob, (continued)
- [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 <=
- [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, 2018/04/24
- [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