From nobody Wed Nov 5 07:32:46 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 1533616667895503.1640392987722; Mon, 6 Aug 2018 21:37:47 -0700 (PDT) Received: from localhost ([::1]:37275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmtkc-0007sL-LC for importer@patchew.org; Tue, 07 Aug 2018 00:37:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmth3-0004gG-Ia for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:34:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmth1-0001HO-JQ for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:34:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:35316 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 1fmtgv-0001Bu-4r; Tue, 07 Aug 2018 00:33:53 -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 0A0F887916; Tue, 7 Aug 2018 04:33:52 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-197.bos.redhat.com [10.18.17.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id B18082022BD4; Tue, 7 Aug 2018 04:33:51 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 7 Aug 2018 00:33:32 -0400 Message-Id: <20180807043349.27196-5-jsnow@redhat.com> In-Reply-To: <20180807043349.27196-1-jsnow@redhat.com> References: <20180807043349.27196-1-jsnow@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, 07 Aug 2018 04:33:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 07 Aug 2018 04:33:52 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@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] [PATCH 04/21] block/commit: 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 , Markus Armbruster , "Dr. David Alan Gilbert" , 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" Change the manual deferment to commit_complete into the implicit callback to job_exit. Signed-off-by: John Snow Reviewed-by: Jeff Cody --- block/commit.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/block/commit.c b/block/commit.c index 620666161b..5bed098d5f 100644 --- a/block/commit.c +++ b/block/commit.c @@ -68,19 +68,14 @@ static int coroutine_fn commit_populate(BlockBackend *b= s, BlockBackend *base, return 0; } =20 -typedef struct { - int ret; -} CommitCompleteData; - -static void commit_complete(Job *job, void *opaque) +static void commit_exit(Job *job) { CommitBlockJob *s =3D container_of(job, CommitBlockJob, common.job); BlockJob *bjob =3D &s->common; - CommitCompleteData *data =3D opaque; BlockDriverState *top =3D blk_bs(s->top); BlockDriverState *base =3D blk_bs(s->base); BlockDriverState *commit_top_bs =3D s->commit_top_bs; - int ret =3D data->ret; + int ret =3D job->ret; bool remove_commit_top_bs =3D false; =20 /* Make sure commit_top_bs and top stay around until bdrv_replace_node= () */ @@ -117,9 +112,6 @@ static void commit_complete(Job *job, void *opaque) * bdrv_set_backing_hd() to fail. */ block_job_remove_all_bdrv(bjob); =20 - job_completed(job, ret); - g_free(data); - /* If bdrv_drop_intermediate() didn't already do that, remove the comm= it * filter driver from the backing chain. Do this as the final step so = that * the 'consistent read' permission can be granted. */ @@ -132,12 +124,12 @@ static void commit_complete(Job *job, void *opaque) =20 bdrv_unref(commit_top_bs); bdrv_unref(top); + job->ret =3D ret; } =20 static void coroutine_fn commit_run(void *opaque) { CommitBlockJob *s =3D opaque; - CommitCompleteData *data; int64_t offset; uint64_t delay_ns =3D 0; int ret =3D 0; @@ -210,9 +202,7 @@ static void coroutine_fn commit_run(void *opaque) out: qemu_vfree(buf); =20 - data =3D g_malloc(sizeof(*data)); - data->ret =3D ret; - job_defer_to_main_loop(&s->common.job, commit_complete, data); + s->common.job.ret =3D ret; } =20 static const BlockJobDriver commit_job_driver =3D { @@ -223,6 +213,7 @@ static const BlockJobDriver commit_job_driver =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .start =3D commit_run, + .exit =3D commit_exit, }, }; =20 --=20 2.14.4