mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
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>
This commit is contained in:
parent
33e9e9bd62
commit
8e4c87000f
7 changed files with 16 additions and 16 deletions
|
@ -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;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue