From nobody Wed Oct 29 17:27:10 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 1524585252650500.2763897411728; Tue, 24 Apr 2018 08:54:12 -0700 (PDT) Received: from localhost ([::1]:59258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB0Gh-000584-Mt for importer@patchew.org; Tue, 24 Apr 2018 11:54:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzpV-0008Lk-3a for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzpT-00005p-L9 for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:26:05 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:34866 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 1fAzpQ-0008Qp-AZ; Tue, 24 Apr 2018 11:26:00 -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 EB549F080F; Tue, 24 Apr 2018 15:25:59 +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 DAE90202342F; Tue, 24 Apr 2018 15:25:58 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 24 Apr 2018 17:25:10 +0200 Message-Id: <20180424152515.25664-29-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:59 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 24 Apr 2018 15:25:59 +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 28/33] job: Move job_finish_sync() to Job 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" block_job_finish_sync() doesn't contain anything block job specific any more, so it can be moved to Job. Signed-off-by: Kevin Wolf --- include/qemu/job.h | 9 +++++++++ blockjob.c | 55 +++++++++-----------------------------------------= ---- job.c | 28 +++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/qemu/job.h b/include/qemu/job.h index 6132cf8e21..c5a5d0cfdb 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -365,6 +365,15 @@ typedef void JobDeferToMainLoopFn(Job *job, void *opaq= ue); */ void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaq= ue); =20 +/** + * Synchronously finishes the given @job. If @finish is given, it is calle= d to + * trigger completion or cancellation of the job. + * + * Returns 0 if the job is successfully completed, -ECANCELED if the job w= as + * cancelled before completing, and -errno in other error cases. + */ +int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error *= *errp); + /* TODO To be removed from the public interface */ void job_state_transition(Job *job, JobStatus s1); int job_apply_verb(Job *job, JobVerb bv, Error **errp); diff --git a/blockjob.c b/blockjob.c index f4010988d4..5d91070cd2 100644 --- a/blockjob.c +++ b/blockjob.c @@ -308,40 +308,6 @@ static int block_job_txn_apply(BlockJobTxn *txn, int f= n(BlockJob *), bool lock) return rc; } =20 -static int block_job_finish_sync(BlockJob *job, - void (*finish)(BlockJob *, Error **errp), - Error **errp) -{ - Error *local_err =3D NULL; - int ret; - - assert(blk_bs(job->blk)->job =3D=3D job); - - job_ref(&job->job); - - if (finish) { - finish(job, &local_err); - } - if (local_err) { - error_propagate(errp, local_err); - job_unref(&job->job); - return -EBUSY; - } - /* job_drain calls job_enter, and it should be enough to induce progre= ss - * until the job completes or moves to the main thread. - */ - while (!job->job.deferred_to_main_loop && !job_is_completed(&job->job)= ) { - job_drain(&job->job); - } - while (!job_is_completed(&job->job)) { - aio_poll(qemu_get_aio_context(), true); - } - ret =3D (job_is_cancelled(&job->job) && job->job.ret =3D=3D 0) - ? -ECANCELED : job->job.ret; - job_unref(&job->job); - return ret; -} - static void block_job_completed_txn_abort(BlockJob *job) { AioContext *ctx; @@ -376,7 +342,7 @@ static void block_job_completed_txn_abort(BlockJob *job) ctx =3D blk_get_aio_context(other_job->blk); if (!job_is_completed(&other_job->job)) { assert(job_is_cancelled(&other_job->job)); - block_job_finish_sync(other_job, NULL, NULL); + job_finish_sync(&other_job->job, NULL, NULL); } job_finalize_single(&other_job->job); aio_context_release(ctx); @@ -529,16 +495,18 @@ void block_job_user_cancel(BlockJob *job, bool force,= Error **errp) } =20 /* A wrapper around block_job_cancel() taking an Error ** parameter so it = may be - * used with block_job_finish_sync() without the need for (rather nasty) - * function pointer casts there. */ -static void block_job_cancel_err(BlockJob *job, Error **errp) + * used with job_finish_sync() without the need for (rather nasty) function + * pointer casts there. */ +static void block_job_cancel_err(Job *job, Error **errp) { - block_job_cancel(job, false); + BlockJob *bjob =3D container_of(job, BlockJob, job); + assert(is_block_job(job)); + block_job_cancel(bjob, false); } =20 int block_job_cancel_sync(BlockJob *job) { - return block_job_finish_sync(job, &block_job_cancel_err, NULL); + return job_finish_sync(&job->job, &block_job_cancel_err, NULL); } =20 void block_job_cancel_sync_all(void) @@ -554,14 +522,9 @@ void block_job_cancel_sync_all(void) } } =20 -static void block_job_complete(BlockJob *job, Error **errp) -{ - job_complete(&job->job, errp); -} - int block_job_complete_sync(BlockJob *job, Error **errp) { - return block_job_finish_sync(job, &block_job_complete, errp); + return job_finish_sync(&job->job, job_complete, errp); } =20 void block_job_progress_update(BlockJob *job, uint64_t done) diff --git a/job.c b/job.c index dd68eb13f7..db3d8536f7 100644 --- a/job.c +++ b/job.c @@ -604,3 +604,31 @@ void job_defer_to_main_loop(Job *job, JobDeferToMainLo= opFn *fn, void *opaque) aio_bh_schedule_oneshot(qemu_get_aio_context(), job_defer_to_main_loop_bh, data); } + +int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error *= *errp) +{ + Error *local_err =3D NULL; + int ret; + + job_ref(job); + + if (finish) { + finish(job, &local_err); + } + if (local_err) { + error_propagate(errp, local_err); + job_unref(job); + return -EBUSY; + } + /* job_drain calls job_enter, and it should be enough to induce progre= ss + * until the job completes or moves to the main thread. */ + while (!job->deferred_to_main_loop && !job_is_completed(job)) { + job_drain(job); + } + while (!job_is_completed(job)) { + aio_poll(qemu_get_aio_context(), true); + } + ret =3D (job_is_cancelled(job) && job->ret =3D=3D 0) ? -ECANCELED : jo= b->ret; + job_unref(job); + return ret; +} --=20 2.13.6