Commit 79e14bf7 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

qapi: make use of new BlockJobType 



Switch the string to enum type BlockJobType in BlockJobDriver.

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 2cb5b222

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static void backup_iostatus_reset(BlockJob *job) 


static const BlockJobDriver backup_job_driver = {

    .instance_size  = sizeof(BackupBlockJob),

    .job_type       = "backup",

    .job_type       = BLOCK_JOB_TYPE_BACKUP,

    .set_speed      = backup_set_speed,

    .iostatus_reset = backup_iostatus_reset,

};

block/commit.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp) 


static const BlockJobDriver commit_job_driver = {

    .instance_size = sizeof(CommitBlockJob),

    .job_type      = "commit",

    .job_type      = BLOCK_JOB_TYPE_COMMIT,

    .set_speed     = commit_set_speed,

};

block/mirror.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static void mirror_complete(BlockJob *job, Error **errp) 


static const BlockJobDriver mirror_job_driver = {

    .instance_size = sizeof(MirrorBlockJob),

    .job_type      = "mirror",

    .job_type      = BLOCK_JOB_TYPE_MIRROR,

    .set_speed     = mirror_set_speed,

    .iostatus_reset= mirror_iostatus_reset,

    .complete      = mirror_complete,

block/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp) 


static const BlockJobDriver stream_job_driver = {

    .instance_size = sizeof(StreamBlockJob),

    .job_type      = "stream",

    .job_type      = BLOCK_JOB_TYPE_STREAM,

    .set_speed     = stream_set_speed,

};

blockjob.c

+2 −2
Original line number Diff line number Diff line
@@ -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->driver->job_type);

    info->type      = g_strdup(BlockJobType_lookup[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->driver->job_type,

                              BlockJobType_lookup[job->driver->job_type],

                              bdrv_get_device_name(job->bs),

                              job->len,

                              job->offset,