Commit 8e4c8700 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

job: Rename BlockJobType into JobType 



QAPI types aren't externally visible, so we can rename them without
causing problems. Before we add a job type to Job, rename the enum
so it can be used for more than just block jobs.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent 33e9e9bd

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static const BlockJobDriver backup_job_driver = { 
    .job_driver = {

        .instance_size          = sizeof(BackupBlockJob),

    },

    .job_type               = BLOCK_JOB_TYPE_BACKUP,

    .job_type               = JOB_TYPE_BACKUP,

    .start                  = backup_run,

    .commit                 = backup_commit,

    .abort                  = backup_abort,

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static const BlockJobDriver commit_job_driver = { 
    .job_driver = {

        .instance_size = sizeof(CommitBlockJob),

    },

    .job_type      = BLOCK_JOB_TYPE_COMMIT,

    .job_type      = JOB_TYPE_COMMIT,

    .start         = commit_run,

};

block/mirror.c

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ static const BlockJobDriver mirror_job_driver = { 
    .job_driver = {

        .instance_size          = sizeof(MirrorBlockJob),

    },

    .job_type               = BLOCK_JOB_TYPE_MIRROR,

    .job_type               = JOB_TYPE_MIRROR,

    .start                  = mirror_run,

    .complete               = mirror_complete,

    .pause                  = mirror_pause,
@@ -1001,7 +1001,7 @@ static const BlockJobDriver commit_active_job_driver = { 
    .job_driver = {

        .instance_size          = sizeof(MirrorBlockJob),

    },

    .job_type               = BLOCK_JOB_TYPE_COMMIT,

    .job_type               = JOB_TYPE_COMMIT,

    .start                  = mirror_run,

    .complete               = mirror_complete,

    .pause                  = mirror_pause,

block/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static const BlockJobDriver stream_job_driver = { 
    .job_driver = {

        .instance_size = sizeof(StreamBlockJob),

    },

    .job_type      = BLOCK_JOB_TYPE_STREAM,

    .job_type      = JOB_TYPE_STREAM,

    .start         = stream_run,

};

blockjob.c

+3 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static char *child_job_get_parent_desc(BdrvChild *c) 
{

    BlockJob *job = c->opaque;

    return g_strdup_printf("%s job '%s'",

                           BlockJobType_str(job->driver->job_type),

                           JobType_str(job->driver->job_type),

                           job->job.id);

}
@@ -847,7 +847,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp) 
        return NULL;

    }

    info = g_new0(BlockJobInfo, 1);

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

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

    info->device    = g_strdup(job->job.id);

    info->len       = job->len;

    info->busy      = atomic_read(&job->busy);
@@ -980,7 +980,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",

               BlockJobType_str(driver->job_type));

               JobType_str(driver->job_type));

    block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);

    bs->job = job;