vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
master
Kevin Wolf 2018-04-12 18:01:07 +02:00
parent 33e9e9bd62
commit 8e4c87000f
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/backup.c
View File

@ -526,7 +526,7 @@ static const BlockJobDriver backup_job_driver = {
.job_driver = { .job_driver = {
.instance_size = sizeof(BackupBlockJob), .instance_size = sizeof(BackupBlockJob),
}, },
.job_type = BLOCK_JOB_TYPE_BACKUP, .job_type = JOB_TYPE_BACKUP,
.start = backup_run, .start = backup_run,
.commit = backup_commit, .commit = backup_commit,
.abort = backup_abort, .abort = backup_abort,

2
block/commit.c
View File

@ -218,7 +218,7 @@ static const BlockJobDriver commit_job_driver = {
.job_driver = { .job_driver = {
.instance_size = sizeof(CommitBlockJob), .instance_size = sizeof(CommitBlockJob),
}, },
.job_type = BLOCK_JOB_TYPE_COMMIT, .job_type = JOB_TYPE_COMMIT,
.start = commit_run, .start = commit_run,
}; };

4
block/mirror.c
View File

@ -989,7 +989,7 @@ static const BlockJobDriver mirror_job_driver = {
.job_driver = { .job_driver = {
.instance_size = sizeof(MirrorBlockJob), .instance_size = sizeof(MirrorBlockJob),
}, },
.job_type = BLOCK_JOB_TYPE_MIRROR, .job_type = JOB_TYPE_MIRROR,
.start = mirror_run, .start = mirror_run,
.complete = mirror_complete, .complete = mirror_complete,
.pause = mirror_pause, .pause = mirror_pause,
@ -1001,7 +1001,7 @@ static const BlockJobDriver commit_active_job_driver = {
.job_driver = { .job_driver = {
.instance_size = sizeof(MirrorBlockJob), .instance_size = sizeof(MirrorBlockJob),
}, },
.job_type = BLOCK_JOB_TYPE_COMMIT, .job_type = JOB_TYPE_COMMIT,
.start = mirror_run, .start = mirror_run,
.complete = mirror_complete, .complete = mirror_complete,
.pause = mirror_pause, .pause = mirror_pause,

2
block/stream.c
View File

@ -212,7 +212,7 @@ static const BlockJobDriver stream_job_driver = {
.job_driver = { .job_driver = {
.instance_size = sizeof(StreamBlockJob), .instance_size = sizeof(StreamBlockJob),
}, },
.job_type = BLOCK_JOB_TYPE_STREAM, .job_type = JOB_TYPE_STREAM,
.start = stream_run, .start = stream_run,
}; };

6
blockjob.c
View File

@ -310,7 +310,7 @@ static char *child_job_get_parent_desc(BdrvChild *c)
{ {
BlockJob *job = c->opaque; BlockJob *job = c->opaque;
return g_strdup_printf("%s job '%s'", return g_strdup_printf("%s job '%s'",
BlockJobType_str(job->driver->job_type), JobType_str(job->driver->job_type),
job->job.id); job->job.id);
} }
@ -847,7 +847,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
return NULL; return NULL;
} }
info = g_new0(BlockJobInfo, 1); 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->device = g_strdup(job->job.id);
info->len = job->len; info->len = job->len;
info->busy = atomic_read(&job->busy); 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); block_job_sleep_timer_cb, job);
error_setg(&job->blocker, "block device is in use by block job: %s", 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); block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
bs->job = job; bs->job = job;

2
include/block/blockjob_int.h
View File

@ -39,7 +39,7 @@ struct BlockJobDriver {
JobDriver job_driver; JobDriver job_driver;
/** String describing the operation, part of query-block-jobs QMP API */ /** String describing the operation, part of query-block-jobs QMP API */
BlockJobType job_type; JobType job_type;
/** Mandatory: Entrypoint for the Coroutine. */ /** Mandatory: Entrypoint for the Coroutine. */
CoroutineEntry *start; CoroutineEntry *start;

14
qapi/block-core.json
View File

@ -1050,9 +1050,9 @@
'data': ['top', 'full', 'none', 'incremental'] } 'data': ['top', 'full', 'none', 'incremental'] }
## ##
# @BlockJobType: # @JobType:
# #
# Type of a block job. # Type of a background job.
# #
# @commit: block commit job type, see "block-commit" # @commit: block commit job type, see "block-commit"
# #
@ -1064,7 +1064,7 @@
# #
# Since: 1.7 # Since: 1.7
## ##
{ 'enum': 'BlockJobType', { 'enum': 'JobType',
'data': ['commit', 'stream', 'mirror', 'backup'] } 'data': ['commit', 'stream', 'mirror', 'backup'] }
## ##
@ -4499,7 +4499,7 @@
# #
## ##
{ 'event': 'BLOCK_JOB_COMPLETED', { 'event': 'BLOCK_JOB_COMPLETED',
'data': { 'type' : 'BlockJobType', 'data': { 'type' : 'JobType',
'device': 'str', 'device': 'str',
'len' : 'int', 'len' : 'int',
'offset': 'int', 'offset': 'int',
@ -4535,7 +4535,7 @@
# #
## ##
{ 'event': 'BLOCK_JOB_CANCELLED', { 'event': 'BLOCK_JOB_CANCELLED',
'data': { 'type' : 'BlockJobType', 'data': { 'type' : 'JobType',
'device': 'str', 'device': 'str',
'len' : 'int', 'len' : 'int',
'offset': 'int', 'offset': 'int',
@ -4600,7 +4600,7 @@
# #
## ##
{ 'event': 'BLOCK_JOB_READY', { 'event': 'BLOCK_JOB_READY',
'data': { 'type' : 'BlockJobType', 'data': { 'type' : 'JobType',
'device': 'str', 'device': 'str',
'len' : 'int', 'len' : 'int',
'offset': 'int', 'offset': 'int',
@ -4627,7 +4627,7 @@
# #
## ##
{ 'event': 'BLOCK_JOB_PENDING', { 'event': 'BLOCK_JOB_PENDING',
'data': { 'type' : 'BlockJobType', 'data': { 'type' : 'JobType',
'id' : 'str' } } 'id' : 'str' } }
## ##