From nobody Sun Feb 8 19:59:44 2026 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 148890137577980.12729633523577; Tue, 7 Mar 2017 07:42:55 -0800 (PST) Received: from localhost ([::1]:51247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHGH-0002p2-EH for importer@patchew.org; Tue, 07 Mar 2017 10:42:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42469) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clHEf-00028K-Vy for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clHEf-0002g5-6W for qemu-devel@nongnu.org; Tue, 07 Mar 2017 10:41:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:16045) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1clHEZ-0002X3-Ov; Tue, 07 Mar 2017 10:41:07 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 E39FF4DD62; Tue, 7 Mar 2017 15:41:07 +0000 (UTC) Received: from noname.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v27FeuUa032123; Tue, 7 Mar 2017 10:41:06 -0500 From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 7 Mar 2017 16:40:31 +0100 Message-Id: <1488901251-16214-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1488901251-16214-1-git-send-email-kwolf@redhat.com> References: <1488901251-16214-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 07 Mar 2017 15:41:07 +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 07/27] block: Factor out bdrv_replace_child_noperm() 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" Signed-off-by: Kevin Wolf Reviewed-by: Fam Zheng Reviewed-by: Eric Blake --- block.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index 6dc02b8..d4570c8 100644 --- a/block.c +++ b/block.c @@ -1713,11 +1713,10 @@ void bdrv_format_default_perms(BlockDriverState *bs= , BdrvChild *c, *nshared =3D shared; } =20 -static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs, - bool check_new_perm) +static void bdrv_replace_child_noperm(BdrvChild *child, + BlockDriverState *new_bs) { BlockDriverState *old_bs =3D child->bs; - uint64_t perm, shared_perm; =20 if (old_bs) { if (old_bs->quiesce_counter && child->role->drained_end) { @@ -1727,7 +1726,29 @@ static void bdrv_replace_child(BdrvChild *child, Blo= ckDriverState *new_bs, child->role->detach(child); } QLIST_REMOVE(child, next_parent); + } + + child->bs =3D new_bs; + + if (new_bs) { + QLIST_INSERT_HEAD(&new_bs->parents, child, next_parent); + if (new_bs->quiesce_counter && child->role->drained_begin) { + child->role->drained_begin(child); + } + + if (child->role->attach) { + child->role->attach(child); + } + } +} =20 +static void bdrv_replace_child(BdrvChild *child, BlockDriverState *new_bs, + bool check_new_perm) +{ + BlockDriverState *old_bs =3D child->bs; + uint64_t perm, shared_perm; + + if (old_bs) { /* Update permissions for old node. This is guaranteed to succeed * because we're just taking a parent away, so we're loosening * restrictions. */ @@ -1736,23 +1757,14 @@ static void bdrv_replace_child(BdrvChild *child, Bl= ockDriverState *new_bs, bdrv_set_perm(old_bs, perm, shared_perm); } =20 - child->bs =3D new_bs; + bdrv_replace_child_noperm(child, new_bs); =20 if (new_bs) { - QLIST_INSERT_HEAD(&new_bs->parents, child, next_parent); - if (new_bs->quiesce_counter && child->role->drained_begin) { - child->role->drained_begin(child); - } - bdrv_get_cumulative_perm(new_bs, &perm, &shared_perm); if (check_new_perm) { bdrv_check_perm(new_bs, perm, shared_perm, &error_abort); } bdrv_set_perm(new_bs, perm, shared_perm); - - if (child->role->attach) { - child->role->attach(child); - } } } =20 --=20 1.8.3.1