From nobody Sun Apr 13 04:32:25 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488315353739360.3194423189524; Tue, 28 Feb 2017 12:55:53 -0800 (PST) Received: from localhost ([::1]:36847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciooH-0004iw-Bm for importer@patchew.org; Tue, 28 Feb 2017 15:55:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cioX0-0006Qs-I0 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 15:37:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cioWz-00081I-JN for qemu-devel@nongnu.org; Tue, 28 Feb 2017 15:37:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cioWx-0007z9-7Y; Tue, 28 Feb 2017 15:37:55 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55958C054C51; Tue, 28 Feb 2017 20:37:55 +0000 (UTC) Received: from noname.redhat.com (ovpn-116-177.ams2.redhat.com [10.36.116.177]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1SKapFY021888; Tue, 28 Feb 2017 15:37:53 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 28 Feb 2017 21:36:32 +0100 Message-Id: <1488314205-16264-34-git-send-email-kwolf@redhat.com> In-Reply-To: <1488314205-16264-1-git-send-email-kwolf@redhat.com> References: <1488314205-16264-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 28 Feb 2017 20:37:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 33/46] blockjob: Factor out block_job_remove_all_bdrv() 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, qemu-devel@nongnu.org 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" In some cases, we want to remove op blockers on intermediate nodes before the whole block job transaction has completed (because they block restoring the final graph state during completion). Provide a function for this. The whole block job lifecycle is a bit messed up and it's hard to actually do all things in the right order, but I'll leave simplifying this for another day. Signed-off-by: Kevin Wolf Acked-by: Fam Zheng Reviewed-by: Max Reitz --- blockjob.c | 20 +++++++++++++------- include/block/blockjob.h | 9 +++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/blockjob.c b/blockjob.c index 4216cde..69126af 100644 --- a/blockjob.c +++ b/blockjob.c @@ -128,6 +128,18 @@ static void block_job_detach_aio_context(void *opaque) block_job_unref(job); } =20 +void block_job_remove_all_bdrv(BlockJob *job) +{ + GSList *l; + for (l =3D job->nodes; l; l =3D l->next) { + BdrvChild *c =3D l->data; + bdrv_op_unblock_all(c->bs, job->blocker); + bdrv_root_unref_child(c); + } + g_slist_free(job->nodes); + job->nodes =3D NULL; +} + int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *= bs, uint64_t perm, uint64_t shared_perm, Error **errp) { @@ -258,15 +270,9 @@ void block_job_ref(BlockJob *job) void block_job_unref(BlockJob *job) { if (--job->refcnt =3D=3D 0) { - GSList *l; BlockDriverState *bs =3D blk_bs(job->blk); bs->job =3D NULL; - for (l =3D job->nodes; l; l =3D l->next) { - BdrvChild *c =3D l->data; - bdrv_op_unblock_all(c->bs, job->blocker); - bdrv_root_unref_child(c); - } - g_slist_free(job->nodes); + block_job_remove_all_bdrv(job); blk_remove_aio_context_notifier(job->blk, block_job_attached_aio_context, block_job_detach_aio_context, job); diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 9d65ef8..9e906f7 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -181,6 +181,15 @@ int block_job_add_bdrv(BlockJob *job, const char *name= , BlockDriverState *bs, uint64_t perm, uint64_t shared_perm, Error **errp); =20 /** + * block_job_remove_all_bdrv: + * @job: The block job + * + * Remove all BlockDriverStates from the list of nodes that are involved i= n the + * job. This removes the blockers added with block_job_add_bdrv(). + */ +void block_job_remove_all_bdrv(BlockJob *job); + +/** * block_job_set_speed: * @job: The job to set the speed for. * @speed: The new value --=20 1.8.3.1