Commit 3fc4b10a authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

blockjob: rename BlockJobType to BlockJobDriver 



We will use BlockJobType as the enum type name of block jobs in QAPI,
rename current BlockJobType to BlockJobDriver, which will eventually
become a set of operations, similar to block drivers.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 39c153b8

block/backup.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void backup_iostatus_reset(BlockJob *job) 
    bdrv_iostatus_reset(s->target);

}



static const BlockJobType backup_job_type = {

static const BlockJobDriver backup_job_driver = {

    .instance_size  = sizeof(BackupBlockJob),

    .job_type       = "backup",

    .set_speed      = backup_set_speed,
@@ -370,7 +370,7 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, 
        return;

    }



    BackupBlockJob *job = block_job_create(&backup_job_type, bs, speed,

    BackupBlockJob *job = block_job_create(&backup_job_driver, bs, speed,

                                           cb, opaque, errp);

    if (!job) {

        return;

block/commit.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp) 
    ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME);

}



static const BlockJobType commit_job_type = {

static const BlockJobDriver commit_job_driver = {

    .instance_size = sizeof(CommitBlockJob),

    .job_type      = "commit",

    .set_speed     = commit_set_speed,
@@ -238,7 +238,7 @@ void commit_start(BlockDriverState *bs, BlockDriverState *base, 
    }





    s = block_job_create(&commit_job_type, bs, speed, cb, opaque, errp);

    s = block_job_create(&commit_job_driver, bs, speed, cb, opaque, errp);

    if (!s) {

        return;

    }

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void mirror_complete(BlockJob *job, Error **errp) 
    block_job_resume(job);

}



static const BlockJobType mirror_job_type = {

static const BlockJobDriver mirror_job_driver = {

    .instance_size = sizeof(MirrorBlockJob),

    .job_type      = "mirror",

    .set_speed     = mirror_set_speed,
@@ -563,7 +563,7 @@ void mirror_start(BlockDriverState *bs, BlockDriverState *target, 
        return;

    }



    s = block_job_create(&mirror_job_type, bs, speed, cb, opaque, errp);

    s = block_job_create(&mirror_job_driver, bs, speed, cb, opaque, errp);

    if (!s) {

        return;

    }

block/stream.c

+2 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp) 
    ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME);

}



static const BlockJobType stream_job_type = {

static const BlockJobDriver stream_job_driver = {

    .instance_size = sizeof(StreamBlockJob),

    .job_type      = "stream",

    .set_speed     = stream_set_speed,
@@ -224,7 +224,7 @@ void stream_start(BlockDriverState *bs, BlockDriverState *base, 
        return;

    }



    s = block_job_create(&stream_job_type, bs, speed, cb, opaque, errp);

    s = block_job_create(&stream_job_driver, bs, speed, cb, opaque, errp);

    if (!s) {

        return;

    }

blockjob.c

+11 −11
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "qmp-commands.h"

#include "qemu/timer.h"



void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs,

void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,

                       int64_t speed, BlockDriverCompletionFunc *cb,

                       void *opaque, Error **errp)

{
@@ -48,8 +48,8 @@ void *block_job_create(const BlockJobType *job_type, BlockDriverState *bs, 
    bdrv_ref(bs);

    bdrv_set_in_use(bs, 1);



    job = g_malloc0(job_type->instance_size);

    job->job_type      = job_type;

    job = g_malloc0(driver->instance_size);

    job->driver        = driver;

    job->bs            = bs;

    job->cb            = cb;

    job->opaque        = opaque;
@@ -87,11 +87,11 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) 
{

    Error *local_err = NULL;



    if (!job->job_type->set_speed) {

    if (!job->driver->set_speed) {

        error_set(errp, QERR_NOT_SUPPORTED);

        return;

    }

    job->job_type->set_speed(job, speed, &local_err);

    job->driver->set_speed(job, speed, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        return;
@@ -102,12 +102,12 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) 


void block_job_complete(BlockJob *job, Error **errp)

{

    if (job->paused || job->cancelled || !job->job_type->complete) {

    if (job->paused || job->cancelled || !job->driver->complete) {

        error_set(errp, QERR_BLOCK_JOB_NOT_READY, job->bs->device_name);

        return;

    }



    job->job_type->complete(job, errp);

    job->driver->complete(job, errp);

}



void block_job_pause(BlockJob *job)
@@ -143,8 +143,8 @@ bool block_job_is_cancelled(BlockJob *job) 
void block_job_iostatus_reset(BlockJob *job)

{

    job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;

    if (job->job_type->iostatus_reset) {

        job->job_type->iostatus_reset(job);

    if (job->driver->iostatus_reset) {

        job->driver->iostatus_reset(job);

    }

}
@@ -209,7 +209,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns) 
BlockJobInfo *block_job_query(BlockJob *job)

{

    BlockJobInfo *info = g_new0(BlockJobInfo, 1);

    info->type      = g_strdup(job->job_type->job_type);

    info->type      = g_strdup(job->driver->job_type);

    info->device    = g_strdup(bdrv_get_device_name(job->bs));

    info->len       = job->len;

    info->busy      = job->busy;
@@ -236,7 +236,7 @@ QObject *qobject_from_block_job(BlockJob *job) 
                              "'len': %" PRId64 ","

                              "'offset': %" PRId64 ","

                              "'speed': %" PRId64 " }",

                              job->job_type->job_type,

                              job->driver->job_type,

                              bdrv_get_device_name(job->bs),

                              job->len,

                              job->offset,