From nobody Tue Apr 15 03:11:27 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619782895; cv=none; d=zohomail.com; s=zohoarc; b=eaFO6eyz4j/Ca7dvIh6ilOJegv5hxB7TcJZBOpR2fr19LMIJJnDbOletso6pY+paV73YTFKZ5oaPhuFNJsC+L5rQ3Z+RkeR/xUbT51yOzICXJM9lLGzm9F9a+25Vp9s3yQAd8Re5fL6RV0Ncooxwt5FwEDpJ1JSmRdOHcfoElsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619782895; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QBKCnfKvo0CVABKe+q3X/ZQJ8tRBESUAWwj1nRU28F0=; b=OrwrgUfD6B4YV31AK5Cokb8Hn+H2AxioXgpATepU30+jAREJO+Qn+JH4MQNo5mXlyghfibdTx82T5kxkU3+MWKaJmChtZt06YpvDESzsKl3k/udjdXOCQJS131VdtTZZrce8JQ5gtjvsVQSD1GGoF3/cFvA4fZt9fIYyzyObU7U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619782895730281.4309144616651; Fri, 30 Apr 2021 04:41:35 -0700 (PDT) Received: from localhost ([::1]:55030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lcRWY-0004cP-NH for importer@patchew.org; Fri, 30 Apr 2021 07:41:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcQly-0005B9-LR for qemu-devel@nongnu.org; Fri, 30 Apr 2021 06:53:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:31137) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lcQlp-0002tt-GO for qemu-devel@nongnu.org; Fri, 30 Apr 2021 06:53:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-160-cgDtcAM1NNaOUdSULDDTiQ-1; Fri, 30 Apr 2021 06:53:04 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 833BF18B9EEB; Fri, 30 Apr 2021 10:53:03 +0000 (UTC) Received: from merkur.fritz.box (ovpn-114-197.ams2.redhat.com [10.36.114.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 569D47B122; Fri, 30 Apr 2021 10:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619779988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QBKCnfKvo0CVABKe+q3X/ZQJ8tRBESUAWwj1nRU28F0=; b=VuvRfU8EwAeBA0g66QM3ZGxp3T1HA4TYVo5EX94Gd3+9SRansq+Y+KaoZO+2dtFuj7RBvT dPq7MYwh3Dglys5WVoNGm6lA0RlRUFxYniODHKaN0m/h85ydW8zDnzWOSXL+CWGrMVwg/D hRH7bTtO604f5PV0lH0Z7g/F80a4YHQ= X-MC-Unique: cgDtcAM1NNaOUdSULDDTiQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 19/39] block: add bdrv_attach_child_noperm() transaction action Date: Fri, 30 Apr 2021 12:51:27 +0200 Message-Id: <20210430105147.125840-20-kwolf@redhat.com> In-Reply-To: <20210430105147.125840-1-kwolf@redhat.com> References: <20210430105147.125840-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.22, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Split no-perm part of bdrv_attach_child as separate transaction action. It will be used in later commits. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Kevin Wolf Message-Id: <20210428151804.439460-20-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf --- block.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 58 insertions(+), 13 deletions(-) diff --git a/block.c b/block.c index 4d5c60f2ae..c74e6e7cc1 100644 --- a/block.c +++ b/block.c @@ -85,6 +85,14 @@ static BlockDriverState *bdrv_open_inherit(const char *f= ilename, =20 static void bdrv_replace_child_noperm(BdrvChild *child, BlockDriverState *new_bs); +static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, + BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + BdrvChild **child, + Transaction *tran, + Error **errp); =20 static int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQ= ueue *queue, Error **errp); @@ -3079,6 +3087,40 @@ static int bdrv_attach_child_common(BlockDriverState= *child_bs, return 0; } =20 +static int bdrv_attach_child_noperm(BlockDriverState *parent_bs, + BlockDriverState *child_bs, + const char *child_name, + const BdrvChildClass *child_class, + BdrvChildRole child_role, + BdrvChild **child, + Transaction *tran, + Error **errp) +{ + int ret; + uint64_t perm, shared_perm; + + assert(parent_bs->drv); + + bdrv_get_cumulative_perm(parent_bs, &perm, &shared_perm); + bdrv_child_perm(parent_bs, child_bs, NULL, child_role, NULL, + perm, shared_perm, &perm, &shared_perm); + + ret =3D bdrv_attach_child_common(child_bs, child_name, child_class, + child_role, perm, shared_perm, parent_b= s, + child, tran, errp); + if (ret < 0) { + return ret; + } + + QLIST_INSERT_HEAD(&parent_bs->children, *child, next); + /* + * child is removed in bdrv_attach_child_common_abort(), so don't care= to + * abort this change separately. + */ + + return 0; +} + static void bdrv_detach_child(BdrvChild *child) { bdrv_replace_child(child, NULL); @@ -3139,23 +3181,26 @@ BdrvChild *bdrv_attach_child(BlockDriverState *pare= nt_bs, BdrvChildRole child_role, Error **errp) { - BdrvChild *child; - uint64_t perm, shared_perm; - - bdrv_get_cumulative_perm(parent_bs, &perm, &shared_perm); + int ret; + BdrvChild *child =3D NULL; + Transaction *tran =3D tran_new(); =20 - assert(parent_bs->drv); - bdrv_child_perm(parent_bs, child_bs, NULL, child_role, NULL, - perm, shared_perm, &perm, &shared_perm); + ret =3D bdrv_attach_child_noperm(parent_bs, child_bs, child_name, chil= d_class, + child_role, &child, tran, errp); + if (ret < 0) { + goto out; + } =20 - child =3D bdrv_root_attach_child(child_bs, child_name, child_class, - child_role, perm, shared_perm, parent_b= s, - errp); - if (child =3D=3D NULL) { - return NULL; + ret =3D bdrv_refresh_perms(parent_bs, errp); + if (ret < 0) { + goto out; } =20 - QLIST_INSERT_HEAD(&parent_bs->children, child, next); +out: + tran_finalize(tran, ret); + + bdrv_unref(child_bs); + return child; } =20 --=20 2.30.2