diff options
| author | Fam Zheng <famz@redhat.com> | 2013-10-08 17:29:40 +0800 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-10-11 10:52:54 +0200 |
| commit | 79e14bf7782d861d3d773a67680de07a8f354f4e (patch) | |
| tree | 07922b6bb3b2b800babb90dd795ee241e9dc2a31 | |
| parent | 2cb5b22286a7546226d9e9363aaee543fcba6b61 (diff) | |
qapi: make use of new BlockJobType
Switch the string to enum type BlockJobType in BlockJobDriver.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/backup.c | 2 | ||||
| -rw-r--r-- | block/commit.c | 2 | ||||
| -rw-r--r-- | block/mirror.c | 2 | ||||
| -rw-r--r-- | block/stream.c | 2 | ||||
| -rw-r--r-- | blockjob.c | 4 | ||||
| -rw-r--r-- | include/block/blockjob.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/block/backup.c b/block/backup.c index d374472da8..cad14c90b2 100644 --- a/block/backup.c +++ b/block/backup.c @@ -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, }; diff --git a/block/commit.c b/block/commit.c index 5146138c67..d4090cbf7d 100644 --- a/block/commit.c +++ b/block/commit.c @@ -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, }; diff --git a/block/mirror.c b/block/mirror.c index 991cc243bc..7b95acf88c 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -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, diff --git a/block/stream.c b/block/stream.c index 7f412bda59..694fd42e41 100644 --- a/block/stream.c +++ b/block/stream.c @@ -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, }; diff --git a/blockjob.c b/blockjob.c index 6814e699fc..9e5fd5c162 100644 --- a/blockjob.c +++ b/blockjob.c @@ -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, diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 99359b5502..d76de62a46 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -37,7 +37,7 @@ typedef struct BlockJobDriver { size_t instance_size; /** String describing the operation, part of query-block-jobs QMP API */ - const char *job_type; + BlockJobType job_type; /** Optional callback for job types that support setting a speed limit */ void (*set_speed)(BlockJob *job, int64_t speed, Error **errp); |