falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Fam Zheng 2013-10-08 17:29:40 +08:00 committed by Kevin Wolf
parent 2cb5b22286
commit 79e14bf778
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/backup.c
View File

@ -204,7 +204,7 @@ static void backup_iostatus_reset(BlockJob *job)
static const BlockJobDriver backup_job_driver = { static const BlockJobDriver backup_job_driver = {
.instance_size = sizeof(BackupBlockJob), .instance_size = sizeof(BackupBlockJob),
.job_type = "backup", .job_type = BLOCK_JOB_TYPE_BACKUP,
.set_speed = backup_set_speed, .set_speed = backup_set_speed,
.iostatus_reset = backup_iostatus_reset, .iostatus_reset = backup_iostatus_reset,
}; };

2
block/commit.c
View File

@ -175,7 +175,7 @@ static void commit_set_speed(BlockJob *job, int64_t speed, Error **errp)
static const BlockJobDriver commit_job_driver = { static const BlockJobDriver commit_job_driver = {
.instance_size = sizeof(CommitBlockJob), .instance_size = sizeof(CommitBlockJob),
.job_type = "commit", .job_type = BLOCK_JOB_TYPE_COMMIT,
.set_speed = commit_set_speed, .set_speed = commit_set_speed,
}; };

2
block/mirror.c
View File

@ -527,7 +527,7 @@ static void mirror_complete(BlockJob *job, Error **errp)
static const BlockJobDriver mirror_job_driver = { static const BlockJobDriver mirror_job_driver = {
.instance_size = sizeof(MirrorBlockJob), .instance_size = sizeof(MirrorBlockJob),
.job_type = "mirror", .job_type = BLOCK_JOB_TYPE_MIRROR,
.set_speed = mirror_set_speed, .set_speed = mirror_set_speed,
.iostatus_reset= mirror_iostatus_reset, .iostatus_reset= mirror_iostatus_reset,
.complete = mirror_complete, .complete = mirror_complete,

2
block/stream.c
View File

@ -205,7 +205,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp)
static const BlockJobDriver stream_job_driver = { static const BlockJobDriver stream_job_driver = {
.instance_size = sizeof(StreamBlockJob), .instance_size = sizeof(StreamBlockJob),
.job_type = "stream", .job_type = BLOCK_JOB_TYPE_STREAM,
.set_speed = stream_set_speed, .set_speed = stream_set_speed,
}; };

4
blockjob.c
View File

@ -209,7 +209,7 @@ void block_job_sleep_ns(BlockJob *job, QEMUClockType type, int64_t ns)
BlockJobInfo *block_job_query(BlockJob *job) BlockJobInfo *block_job_query(BlockJob *job)
{ {
BlockJobInfo *info = g_new0(BlockJobInfo, 1); 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->device = g_strdup(bdrv_get_device_name(job->bs));
info->len = job->len; info->len = job->len;
info->busy = job->busy; info->busy = job->busy;
@ -236,7 +236,7 @@ QObject *qobject_from_block_job(BlockJob *job)
"'len': %" PRId64 "," "'len': %" PRId64 ","
"'offset': %" PRId64 "," "'offset': %" PRId64 ","
"'speed': %" PRId64 " }", "'speed': %" PRId64 " }",
job->driver->job_type, BlockJobType_lookup[job->driver->job_type],
bdrv_get_device_name(job->bs), bdrv_get_device_name(job->bs),
job->len, job->len,
job->offset, job->offset,

2
include/block/blockjob.h
View File

@ -37,7 +37,7 @@ typedef struct BlockJobDriver {
size_t instance_size; size_t instance_size;
/** String describing the operation, part of query-block-jobs QMP API */ /** 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 */ /** Optional callback for job types that support setting a speed limit */
void (*set_speed)(BlockJob *job, int64_t speed, Error **errp); void (*set_speed)(BlockJob *job, int64_t speed, Error **errp);