From nobody Wed Oct 29 09:08:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524584325399970.2602514703979; Tue, 24 Apr 2018 08:38:45 -0700 (PDT) Received: from localhost ([::1]:59155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB01i-00015J-4U for importer@patchew.org; Tue, 24 Apr 2018 11:38:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzp4-0007qy-R2 for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:25:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzp3-0007vO-CB for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:25:38 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34834 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fAzoz-0007mr-G6; Tue, 24 Apr 2018 11:25:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2590A738E0; Tue, 24 Apr 2018 15:25:33 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-100.ams2.redhat.com [10.36.117.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 13EC1202342F; Tue, 24 Apr 2018 15:25:31 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 24 Apr 2018 17:24:50 +0200 Message-Id: <20180424152515.25664-9-kwolf@redhat.com> In-Reply-To: <20180424152515.25664-1-kwolf@redhat.com> References: <20180424152515.25664-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 24 Apr 2018 15:25:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 24 Apr 2018 15:25:33 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [RFC PATCH 08/33] job: Rename BlockJobType into JobType X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, jsnow@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Eric Blake --- qapi/block-core.json | 14 +++++++------- include/block/blockjob_int.h | 2 +- block/backup.c | 2 +- block/commit.c | 2 +- block/mirror.c | 4 ++-- block/stream.c | 2 +- blockjob.c | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index c50517bff3..f2579d46f8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1050,9 +1050,9 @@ 'data': ['top', 'full', 'none', 'incremental'] } =20 ## -# @BlockJobType: +# @JobType: # -# Type of a block job. +# Type of a background job. # # @commit: block commit job type, see "block-commit" # @@ -1064,7 +1064,7 @@ # # Since: 1.7 ## -{ 'enum': 'BlockJobType', +{ 'enum': 'JobType', 'data': ['commit', 'stream', 'mirror', 'backup'] } =20 ## @@ -4485,7 +4485,7 @@ # ## { 'event': 'BLOCK_JOB_COMPLETED', - 'data': { 'type' : 'BlockJobType', + 'data': { 'type' : 'JobType', 'device': 'str', 'len' : 'int', 'offset': 'int', @@ -4521,7 +4521,7 @@ # ## { 'event': 'BLOCK_JOB_CANCELLED', - 'data': { 'type' : 'BlockJobType', + 'data': { 'type' : 'JobType', 'device': 'str', 'len' : 'int', 'offset': 'int', @@ -4586,7 +4586,7 @@ # ## { 'event': 'BLOCK_JOB_READY', - 'data': { 'type' : 'BlockJobType', + 'data': { 'type' : 'JobType', 'device': 'str', 'len' : 'int', 'offset': 'int', @@ -4613,7 +4613,7 @@ # ## { 'event': 'BLOCK_JOB_PENDING', - 'data': { 'type' : 'BlockJobType', + 'data': { 'type' : 'JobType', 'id' : 'str' } } =20 ## diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index a357ad6c5e..3dddd54d43 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -39,7 +39,7 @@ struct BlockJobDriver { JobDriver job_driver; =20 /** String describing the operation, part of query-block-jobs QMP API = */ - BlockJobType job_type; + JobType job_type; =20 /** Mandatory: Entrypoint for the Coroutine. */ CoroutineEntry *start; diff --git a/block/backup.c b/block/backup.c index fa468a64bb..1a23e6fb63 100644 --- a/block/backup.c +++ b/block/backup.c @@ -526,7 +526,7 @@ static const BlockJobDriver backup_job_driver =3D { .job_driver =3D { .instance_size =3D sizeof(BackupBlockJob), }, - .job_type =3D BLOCK_JOB_TYPE_BACKUP, + .job_type =3D JOB_TYPE_BACKUP, .start =3D backup_run, .commit =3D backup_commit, .abort =3D backup_abort, diff --git a/block/commit.c b/block/commit.c index 18cbb2f9c4..afa2b2bacf 100644 --- a/block/commit.c +++ b/block/commit.c @@ -218,7 +218,7 @@ static const BlockJobDriver commit_job_driver =3D { .job_driver =3D { .instance_size =3D sizeof(CommitBlockJob), }, - .job_type =3D BLOCK_JOB_TYPE_COMMIT, + .job_type =3D JOB_TYPE_COMMIT, .start =3D commit_run, }; =20 diff --git a/block/mirror.c b/block/mirror.c index 84de8105e6..8cf275d87f 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -985,7 +985,7 @@ static const BlockJobDriver mirror_job_driver =3D { .job_driver =3D { .instance_size =3D sizeof(MirrorBlockJob), }, - .job_type =3D BLOCK_JOB_TYPE_MIRROR, + .job_type =3D JOB_TYPE_MIRROR, .start =3D mirror_run, .complete =3D mirror_complete, .pause =3D mirror_pause, @@ -997,7 +997,7 @@ static const BlockJobDriver commit_active_job_driver = =3D { .job_driver =3D { .instance_size =3D sizeof(MirrorBlockJob), }, - .job_type =3D BLOCK_JOB_TYPE_COMMIT, + .job_type =3D JOB_TYPE_COMMIT, .start =3D mirror_run, .complete =3D mirror_complete, .pause =3D mirror_pause, diff --git a/block/stream.c b/block/stream.c index f88fc75141..048bceb5d0 100644 --- a/block/stream.c +++ b/block/stream.c @@ -212,7 +212,7 @@ static const BlockJobDriver stream_job_driver =3D { .job_driver =3D { .instance_size =3D sizeof(StreamBlockJob), }, - .job_type =3D BLOCK_JOB_TYPE_STREAM, + .job_type =3D JOB_TYPE_STREAM, .start =3D stream_run, }; =20 diff --git a/blockjob.c b/blockjob.c index abdfc68729..dad6e509f0 100644 --- a/blockjob.c +++ b/blockjob.c @@ -296,7 +296,7 @@ static char *child_job_get_parent_desc(BdrvChild *c) { BlockJob *job =3D c->opaque; return g_strdup_printf("%s job '%s'", - BlockJobType_str(job->driver->job_type), + JobType_str(job->driver->job_type), job->job.id); } =20 @@ -839,7 +839,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **er= rp) return NULL; } info =3D g_new0(BlockJobInfo, 1); - info->type =3D g_strdup(BlockJobType_str(job->driver->job_type)); + info->type =3D g_strdup(JobType_str(job->driver->job_type)); info->device =3D g_strdup(job->job.id); info->len =3D job->len; info->busy =3D atomic_read(&job->busy); @@ -970,7 +970,7 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, block_job_sleep_timer_cb, job); =20 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 =3D job; =20 --=20 2.13.6