26ba25
From a8fa5721ae332c4f16f96e72898a938ed178843b Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Tue, 26 Jun 2018 09:48:00 +0200
26ba25
Subject: [PATCH 092/268] job: Rename BlockJobType into JobType
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20180626094856.6924-18-kwolf@redhat.com>
26ba25
Patchwork-id: 81112
26ba25
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 17/73] job: Rename BlockJobType into JobType
26ba25
Bugzilla: 1513543
26ba25
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
QAPI types aren't externally visible, so we can rename them without
26ba25
causing problems. Before we add a job type to Job, rename the enum
26ba25
so it can be used for more than just block jobs.
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Eric Blake <eblake@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
Reviewed-by: John Snow <jsnow@redhat.com>
26ba25
(cherry picked from commit 8e4c87000fc515f8f65f7c8f18afb1e9270b11d6)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 block/backup.c               |  2 +-
26ba25
 block/commit.c               |  2 +-
26ba25
 block/mirror.c               |  4 ++--
26ba25
 block/stream.c               |  2 +-
26ba25
 blockjob.c                   |  6 +++---
26ba25
 include/block/blockjob_int.h |  2 +-
26ba25
 qapi/block-core.json         | 14 +++++++-------
26ba25
 7 files changed, 16 insertions(+), 16 deletions(-)
26ba25
26ba25
diff --git a/block/backup.c b/block/backup.c
26ba25
index 9e672bb..c49ea92 100644
26ba25
--- a/block/backup.c
26ba25
+++ b/block/backup.c
26ba25
@@ -526,7 +526,7 @@ static const BlockJobDriver backup_job_driver = {
26ba25
     .job_driver = {
26ba25
         .instance_size          = sizeof(BackupBlockJob),
26ba25
     },
26ba25
-    .job_type               = BLOCK_JOB_TYPE_BACKUP,
26ba25
+    .job_type               = JOB_TYPE_BACKUP,
26ba25
     .start                  = backup_run,
26ba25
     .commit                 = backup_commit,
26ba25
     .abort                  = backup_abort,
26ba25
diff --git a/block/commit.c b/block/commit.c
26ba25
index 18cbb2f..afa2b2b 100644
26ba25
--- a/block/commit.c
26ba25
+++ b/block/commit.c
26ba25
@@ -218,7 +218,7 @@ static const BlockJobDriver commit_job_driver = {
26ba25
     .job_driver = {
26ba25
         .instance_size = sizeof(CommitBlockJob),
26ba25
     },
26ba25
-    .job_type      = BLOCK_JOB_TYPE_COMMIT,
26ba25
+    .job_type      = JOB_TYPE_COMMIT,
26ba25
     .start         = commit_run,
26ba25
 };
26ba25
 
26ba25
diff --git a/block/mirror.c b/block/mirror.c
26ba25
index aa1d6b7..ed72656 100644
26ba25
--- a/block/mirror.c
26ba25
+++ b/block/mirror.c
26ba25
@@ -989,7 +989,7 @@ static const BlockJobDriver mirror_job_driver = {
26ba25
     .job_driver = {
26ba25
         .instance_size          = sizeof(MirrorBlockJob),
26ba25
     },
26ba25
-    .job_type               = BLOCK_JOB_TYPE_MIRROR,
26ba25
+    .job_type               = JOB_TYPE_MIRROR,
26ba25
     .start                  = mirror_run,
26ba25
     .complete               = mirror_complete,
26ba25
     .pause                  = mirror_pause,
26ba25
@@ -1001,7 +1001,7 @@ static const BlockJobDriver commit_active_job_driver = {
26ba25
     .job_driver = {
26ba25
         .instance_size          = sizeof(MirrorBlockJob),
26ba25
     },
26ba25
-    .job_type               = BLOCK_JOB_TYPE_COMMIT,
26ba25
+    .job_type               = JOB_TYPE_COMMIT,
26ba25
     .start                  = mirror_run,
26ba25
     .complete               = mirror_complete,
26ba25
     .pause                  = mirror_pause,
26ba25
diff --git a/block/stream.c b/block/stream.c
26ba25
index f88fc75..048bceb 100644
26ba25
--- a/block/stream.c
26ba25
+++ b/block/stream.c
26ba25
@@ -212,7 +212,7 @@ static const BlockJobDriver stream_job_driver = {
26ba25
     .job_driver = {
26ba25
         .instance_size = sizeof(StreamBlockJob),
26ba25
     },
26ba25
-    .job_type      = BLOCK_JOB_TYPE_STREAM,
26ba25
+    .job_type      = JOB_TYPE_STREAM,
26ba25
     .start         = stream_run,
26ba25
 };
26ba25
 
26ba25
diff --git a/blockjob.c b/blockjob.c
26ba25
index 1464856..2a38447 100644
26ba25
--- a/blockjob.c
26ba25
+++ b/blockjob.c
26ba25
@@ -310,7 +310,7 @@ static char *child_job_get_parent_desc(BdrvChild *c)
26ba25
 {
26ba25
     BlockJob *job = c->opaque;
26ba25
     return g_strdup_printf("%s job '%s'",
26ba25
-                           BlockJobType_str(job->driver->job_type),
26ba25
+                           JobType_str(job->driver->job_type),
26ba25
                            job->job.id);
26ba25
 }
26ba25
 
26ba25
@@ -847,7 +847,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
26ba25
         return NULL;
26ba25
     }
26ba25
     info = g_new0(BlockJobInfo, 1);
26ba25
-    info->type      = g_strdup(BlockJobType_str(job->driver->job_type));
26ba25
+    info->type      = g_strdup(JobType_str(job->driver->job_type));
26ba25
     info->device    = g_strdup(job->job.id);
26ba25
     info->len       = job->len;
26ba25
     info->busy      = atomic_read(&job->busy);
26ba25
@@ -980,7 +980,7 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
26ba25
                    block_job_sleep_timer_cb, job);
26ba25
 
26ba25
     error_setg(&job->blocker, "block device is in use by block job: %s",
26ba25
-               BlockJobType_str(driver->job_type));
26ba25
+               JobType_str(driver->job_type));
26ba25
     block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
26ba25
     bs->job = job;
26ba25
 
26ba25
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
26ba25
index e8eca44..8e7e0a2 100644
26ba25
--- a/include/block/blockjob_int.h
26ba25
+++ b/include/block/blockjob_int.h
26ba25
@@ -39,7 +39,7 @@ struct BlockJobDriver {
26ba25
     JobDriver job_driver;
26ba25
 
26ba25
     /** String describing the operation, part of query-block-jobs QMP API */
26ba25
-    BlockJobType job_type;
26ba25
+    JobType job_type;
26ba25
 
26ba25
     /** Mandatory: Entrypoint for the Coroutine. */
26ba25
     CoroutineEntry *start;
26ba25
diff --git a/qapi/block-core.json b/qapi/block-core.json
26ba25
index 2b4566f..cab0697 100644
26ba25
--- a/qapi/block-core.json
26ba25
+++ b/qapi/block-core.json
26ba25
@@ -1050,9 +1050,9 @@
26ba25
   'data': ['top', 'full', 'none', 'incremental'] }
26ba25
 
26ba25
 ##
26ba25
-# @BlockJobType:
26ba25
+# @JobType:
26ba25
 #
26ba25
-# Type of a block job.
26ba25
+# Type of a background job.
26ba25
 #
26ba25
 # @commit: block commit job type, see "block-commit"
26ba25
 #
26ba25
@@ -1064,7 +1064,7 @@
26ba25
 #
26ba25
 # Since: 1.7
26ba25
 ##
26ba25
-{ 'enum': 'BlockJobType',
26ba25
+{ 'enum': 'JobType',
26ba25
   'data': ['commit', 'stream', 'mirror', 'backup'] }
26ba25
 
26ba25
 ##
26ba25
@@ -4513,7 +4513,7 @@
26ba25
 #
26ba25
 ##
26ba25
 { 'event': 'BLOCK_JOB_COMPLETED',
26ba25
-  'data': { 'type'  : 'BlockJobType',
26ba25
+  'data': { 'type'  : 'JobType',
26ba25
             'device': 'str',
26ba25
             'len'   : 'int',
26ba25
             'offset': 'int',
26ba25
@@ -4549,7 +4549,7 @@
26ba25
 #
26ba25
 ##
26ba25
 { 'event': 'BLOCK_JOB_CANCELLED',
26ba25
-  'data': { 'type'  : 'BlockJobType',
26ba25
+  'data': { 'type'  : 'JobType',
26ba25
             'device': 'str',
26ba25
             'len'   : 'int',
26ba25
             'offset': 'int',
26ba25
@@ -4614,7 +4614,7 @@
26ba25
 #
26ba25
 ##
26ba25
 { 'event': 'BLOCK_JOB_READY',
26ba25
-  'data': { 'type'  : 'BlockJobType',
26ba25
+  'data': { 'type'  : 'JobType',
26ba25
             'device': 'str',
26ba25
             'len'   : 'int',
26ba25
             'offset': 'int',
26ba25
@@ -4641,7 +4641,7 @@
26ba25
 #
26ba25
 ##
26ba25
 { 'event': 'BLOCK_JOB_PENDING',
26ba25
-  'data': { 'type'  : 'BlockJobType',
26ba25
+  'data': { 'type'  : 'JobType',
26ba25
             'id'    : 'str' } }
26ba25
 
26ba25
 ##
26ba25
-- 
26ba25
1.8.3.1
26ba25