From nobody Wed Nov 5 12:35:15 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 1534533176225557.4222160465202; Fri, 17 Aug 2018 12:12:56 -0700 (PDT) Received: from localhost ([::1]:36034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqkB3-0004oM-Hx for importer@patchew.org; Fri, 17 Aug 2018 15:12:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqk8v-0001Dr-7f for qemu-devel@nongnu.org; Fri, 17 Aug 2018 15:10:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqk43-0006wZ-7V for qemu-devel@nongnu.org; Fri, 17 Aug 2018 15:05:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45524) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqk3z-0006tS-Ox; Fri, 17 Aug 2018 15:05:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 787474E8A8; Fri, 17 Aug 2018 19:05:33 +0000 (UTC) Received: from probe.redhat.com (ovpn-123-11.rdu2.redhat.com [10.10.123.11]) by smtp.corp.redhat.com (Postfix) with ESMTP id F245D19488; Fri, 17 Aug 2018 19:05:23 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org, qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 15:04:56 -0400 Message-Id: <20180817190457.8292-7-jsnow@redhat.com> In-Reply-To: <20180817190457.8292-1-jsnow@redhat.com> References: <20180817190457.8292-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 17 Aug 2018 19:05:33 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/7] jobs: utilize job_exit shim 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, John Snow , Jeff Cody , jtc@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Utilize the job_exit shim by not calling job_defer_to_main_loop, and where applicable, converting the deferred callback into the job_exit callback. This converts backup, stream, create, and the unit tests all at once. None of these jobs undergo and order of operations changes, so it should be a mechanical change. Signed-off-by: John Snow --- block/backup.c | 16 ---------------- block/create.c | 14 +++----------- block/stream.c | 22 +++++++--------------- tests/test-bdrv-drain.c | 6 ------ tests/test-blockjob-txn.c | 11 ++--------- tests/test-blockjob.c | 10 ++++------ 6 files changed, 16 insertions(+), 63 deletions(-) diff --git a/block/backup.c b/block/backup.c index 1e965d54e5..a67b7fa96b 100644 --- a/block/backup.c +++ b/block/backup.c @@ -380,18 +380,6 @@ static BlockErrorAction backup_error_action(BackupBloc= kJob *job, } } =20 -typedef struct { - int ret; -} BackupCompleteData; - -static void backup_complete(Job *job, void *opaque) -{ - BackupCompleteData *data =3D opaque; - - job_completed(job, data->ret); - g_free(data); -} - static bool coroutine_fn yield_and_check(BackupBlockJob *job) { uint64_t delay_ns; @@ -483,7 +471,6 @@ static void backup_incremental_init_copy_bitmap(BackupB= lockJob *job) static int coroutine_fn backup_run(Job *opaque_job, Error **errp) { BackupBlockJob *job =3D container_of(opaque_job, BackupBlockJob, commo= n.job); - BackupCompleteData *data; BlockDriverState *bs =3D blk_bs(job->common.blk); int64_t offset, nb_clusters; int ret =3D 0; @@ -584,9 +571,6 @@ static int coroutine_fn backup_run(Job *opaque_job, Err= or **errp) qemu_co_rwlock_unlock(&job->flush_rwlock); hbitmap_free(job->copy_bitmap); =20 - data =3D g_malloc(sizeof(*data)); - data->ret =3D ret; - job_defer_to_main_loop(&job->common.job, backup_complete, data); return ret; } =20 diff --git a/block/create.c b/block/create.c index 26a385c6c7..95341219ef 100644 --- a/block/create.c +++ b/block/create.c @@ -34,28 +34,20 @@ typedef struct BlockdevCreateJob { Job common; BlockDriver *drv; BlockdevCreateOptions *opts; - int ret; } BlockdevCreateJob; =20 -static void blockdev_create_complete(Job *job, void *opaque) -{ - BlockdevCreateJob *s =3D container_of(job, BlockdevCreateJob, common); - - job_completed(job, s->ret); -} - static int coroutine_fn blockdev_create_run(Job *job, Error **errp) { BlockdevCreateJob *s =3D container_of(job, BlockdevCreateJob, common); + int ret; =20 job_progress_set_remaining(&s->common, 1); - s->ret =3D s->drv->bdrv_co_create(s->opts, errp); + ret =3D s->drv->bdrv_co_create(s->opts, errp); job_progress_update(&s->common, 1); =20 qapi_free_BlockdevCreateOptions(s->opts); - job_defer_to_main_loop(&s->common, blockdev_create_complete, NULL); =20 - return s->ret; + return ret; } =20 static const JobDriver blockdev_create_job_driver =3D { diff --git a/block/stream.c b/block/stream.c index 26a775386b..67e1e72e23 100644 --- a/block/stream.c +++ b/block/stream.c @@ -54,20 +54,16 @@ static int coroutine_fn stream_populate(BlockBackend *b= lk, return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_R= EAD); } =20 -typedef struct { - int ret; -} StreamCompleteData; - -static void stream_complete(Job *job, void *opaque) +static void stream_exit(Job *job) { StreamBlockJob *s =3D container_of(job, StreamBlockJob, common.job); BlockJob *bjob =3D &s->common; - StreamCompleteData *data =3D opaque; BlockDriverState *bs =3D blk_bs(bjob->blk); BlockDriverState *base =3D s->base; Error *local_err =3D NULL; + int ret =3D job->ret; =20 - if (!job_is_cancelled(job) && bs->backing && data->ret =3D=3D 0) { + if (!job_is_cancelled(job) && bs->backing && ret =3D=3D 0) { const char *base_id =3D NULL, *base_fmt =3D NULL; if (base) { base_id =3D s->backing_file_str; @@ -75,11 +71,11 @@ static void stream_complete(Job *job, void *opaque) base_fmt =3D base->drv->format_name; } } - data->ret =3D bdrv_change_backing_file(bs, base_id, base_fmt); + ret =3D bdrv_change_backing_file(bs, base_id, base_fmt); bdrv_set_backing_hd(bs, base, &local_err); if (local_err) { error_report_err(local_err); - data->ret =3D -EPERM; + ret =3D -EPERM; goto out; } } @@ -93,14 +89,12 @@ out: } =20 g_free(s->backing_file_str); - job_completed(job, data->ret); - g_free(data); + job->ret =3D ret; } =20 static int coroutine_fn stream_run(Job *job, Error **errp) { StreamBlockJob *s =3D container_of(job, StreamBlockJob, common.job); - StreamCompleteData *data; BlockBackend *blk =3D s->common.blk; BlockDriverState *bs =3D blk_bs(blk); BlockDriverState *base =3D s->base; @@ -203,9 +197,6 @@ static int coroutine_fn stream_run(Job *job, Error **er= rp) =20 out: /* Modify backing chain and close BDSes in main loop */ - data =3D g_malloc(sizeof(*data)); - data->ret =3D ret; - job_defer_to_main_loop(&s->common.job, stream_complete, data); return ret; } =20 @@ -215,6 +206,7 @@ static const BlockJobDriver stream_job_driver =3D { .job_type =3D JOB_TYPE_STREAM, .free =3D block_job_free, .run =3D stream_run, + .exit =3D stream_exit, .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, }, diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index 00604dfc0c..9bcb3c72af 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -752,11 +752,6 @@ typedef struct TestBlockJob { bool should_complete; } TestBlockJob; =20 -static void test_job_completed(Job *job, void *opaque) -{ - job_completed(job, 0); -} - static int coroutine_fn test_job_run(Job *job, Error **errp) { TestBlockJob *s =3D container_of(job, TestBlockJob, common.job); @@ -770,7 +765,6 @@ static int coroutine_fn test_job_run(Job *job, Error **= errp) job_pause_point(&s->common.job); } =20 - job_defer_to_main_loop(&s->common.job, test_job_completed, NULL); return 0; } =20 diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 82cedee78b..ef29f35e44 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -24,17 +24,11 @@ typedef struct { int *result; } TestBlockJob; =20 -static void test_block_job_complete(Job *job, void *opaque) +static void test_block_job_exit(Job *job) { BlockJob *bjob =3D container_of(job, BlockJob, job); BlockDriverState *bs =3D blk_bs(bjob->blk); - int rc =3D (intptr_t)opaque; =20 - if (job_is_cancelled(job)) { - rc =3D -ECANCELED; - } - - job_completed(job, rc); bdrv_unref(bs); } =20 @@ -54,8 +48,6 @@ static int coroutine_fn test_block_job_run(Job *job, Erro= r **errp) } } =20 - job_defer_to_main_loop(job, test_block_job_complete, - (void *)(intptr_t)s->rc); return s->rc; } =20 @@ -81,6 +73,7 @@ static const BlockJobDriver test_block_job_driver =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .run =3D test_block_job_run, + .exit =3D test_block_job_exit, }, }; =20 diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index 408a226939..ad4a65bc78 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -163,11 +163,10 @@ typedef struct CancelJob { bool completed; } CancelJob; =20 -static void cancel_job_completed(Job *job, void *opaque) +static void cancel_job_exit(Job *job) { - CancelJob *s =3D opaque; + CancelJob *s =3D container_of(job, CancelJob, common.job); s->completed =3D true; - job_completed(job, 0); } =20 static void cancel_job_complete(Job *job, Error **errp) @@ -182,7 +181,7 @@ static int coroutine_fn cancel_job_run(Job *job, Error = **errp) =20 while (!s->should_complete) { if (job_is_cancelled(&s->common.job)) { - goto defer; + return 0; } =20 if (!job_is_ready(&s->common.job) && s->should_converge) { @@ -192,8 +191,6 @@ static int coroutine_fn cancel_job_run(Job *job, Error = **errp) job_sleep_ns(&s->common.job, 100000); } =20 - defer: - job_defer_to_main_loop(&s->common.job, cancel_job_completed, s); return 0; } =20 @@ -204,6 +201,7 @@ static const BlockJobDriver test_cancel_driver =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .run =3D cancel_job_run, + .exit =3D cancel_job_exit, .complete =3D cancel_job_complete, }, }; --=20 2.14.4