mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
job: Add JobDriver.job_type
This moves the job_type field from BlockJobDriver to JobDriver. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
8e4c87000f
commit
252291eaea
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -988,8 +988,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,
|
||||
|
@ -1000,8 +1000,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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
16
blockjob.c
16
blockjob.c
|
@ -309,9 +309,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)
|
||||
|
@ -847,7 +845,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);
|
||||
|
@ -878,7 +876,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,
|
||||
|
@ -892,7 +890,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,
|
||||
|
@ -906,7 +904,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);
|
||||
}
|
||||
|
@ -980,7 +978,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;
|
||||
|
||||
|
@ -1184,7 +1182,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,
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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(const Job *job);
|
||||
|
||||
/** Returns the enum string for the JobType of a given Job. */
|
||||
const char *job_type_str(const Job *job);
|
||||
|
||||
#endif
|
||||
|
|
10
job.c
10
job.c
|
@ -29,6 +29,16 @@
|
|||
#include "qemu/job.h"
|
||||
#include "qemu/id.h"
|
||||
|
||||
JobType job_type(const Job *job)
|
||||
{
|
||||
return job->driver->job_type;
|
||||
}
|
||||
|
||||
const char *job_type_str(const Job *job)
|
||||
{
|
||||
return JobType_str(job_type(job));
|
||||
}
|
||||
|
||||
void *job_create(const char *job_id, const JobDriver *driver, Error **errp)
|
||||
{
|
||||
Job *job;
|
||||
|
|
Loading…
Reference in a new issue