From nobody Tue Feb 10 02:30:30 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574861201; cv=none; d=zohomail.com; s=zohoarc; b=doxrUWRnn6CoZrprQf0tiVERUVt+mSczI+wDvcHh38qTI2Tfv4Bj/pOu5JVx6DBj+csNGy8YshMNKbWiAa85ZlS5BPE3NK35g4weZZOXctS0xXdNonl0KxkRjlaIXbXYw5Rp6rEATg14bRKR4jnJe+DZT7Ya57rlfD2z5awJ0U0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574861201; 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=w7N8OWUuFmPZS8NPCjvOUeiayIezDH9jjfV/o8mk0ho=; b=Tp3Dv3/n6TC4R9tHPbSjqCKNKEvDQIfNnE9hPloM63TkoBqC/dRljTrrsoiR/R41iLEMz7VM5h0LuPFbWXw/GewymGR0PI5OA6rpj3VGvm9VLJkx/mIkDucoqpHGuVLM2mVM/dDhRSl4luL3i7nsULtubvtlCHNaK5aQ00vUwTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1574861201807170.912185378721; Wed, 27 Nov 2019 05:26:41 -0800 (PST) Received: from localhost ([::1]:38314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxL6-0003JA-CB for importer@patchew.org; Wed, 27 Nov 2019 08:26:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33756) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iZxBo-000419-Gp for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iZxBn-0006hT-6R for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:04 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:48871 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iZxBn-0006go-2r for qemu-devel@nongnu.org; Wed, 27 Nov 2019 08:17:03 -0500 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-386-qlsTQwE7Pb-lBAtMOlnFwQ-1; Wed, 27 Nov 2019 08:16:59 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E56A8C2740; Wed, 27 Nov 2019 13:16:58 +0000 (UTC) Received: from localhost (ovpn-205-186.brq.redhat.com [10.40.205.186]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 283C167646; Wed, 27 Nov 2019 13:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574860622; 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=w7N8OWUuFmPZS8NPCjvOUeiayIezDH9jjfV/o8mk0ho=; b=GptZNZAJW7AByKhs/AZ9Jn1oe+cCD0kDpPBWW/k+D0xhWKaYiBVR6Nmbr3+KQhfeM095VT Iwg2MPFuVP1ItUcuEP6+tm7RpRw2d1oslg9T1dJCveVmbsQ5qSdGnuBnE5zIHxsnmFkhCL 6rduM5k2XspYTxGqo/S+0xVL2v/zqdU= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.0 13/31] block: Pull out bdrv_default_perms_for_backing() Date: Wed, 27 Nov 2019 14:16:06 +0100 Message-Id: <20191127131624.1062403-14-mreitz@redhat.com> In-Reply-To: <20191127131624.1062403-1-mreitz@redhat.com> References: <20191127131624.1062403-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: qlsTQwE7Pb-lBAtMOlnFwQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- block.c | 62 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index eb282f0977..2771bc45ce 100644 --- a/block.c +++ b/block.c @@ -2256,6 +2256,44 @@ void bdrv_filter_default_perms(BlockDriverState *bs,= BdrvChild *c, *nshared =3D (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHAN= GED; } =20 +static void bdrv_default_perms_for_backing(BlockDriverState *bs, BdrvChild= *c, + const BdrvChildClass *child_cla= ss, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nsha= red) +{ + assert(child_class =3D=3D &child_backing || + (child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_COW))); + + /* + * We want consistent read from backing files if the parent needs it. + * No other operations are performed on backing files. + */ + perm &=3D BLK_PERM_CONSISTENT_READ; + + /* + * If the parent can deal with changing data, we're okay with a + * writable and resizable backing file. + * TODO Require !(perm & BLK_PERM_CONSISTENT_READ), too? + */ + if (shared & BLK_PERM_WRITE) { + shared =3D BLK_PERM_WRITE | BLK_PERM_RESIZE; + } else { + shared =3D 0; + } + + shared |=3D BLK_PERM_CONSISTENT_READ | BLK_PERM_GRAPH_MOD | + BLK_PERM_WRITE_UNCHANGED; + + if (bs->open_flags & BDRV_O_INACTIVE) { + shared |=3D BLK_PERM_WRITE | BLK_PERM_RESIZE; + } + + *nperm =3D perm; + *nshared =3D shared; +} + void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, const BdrvChildClass *child_class, BdrvChildRole role, @@ -2293,28 +2331,8 @@ void bdrv_format_default_perms(BlockDriverState *bs,= BdrvChild *c, *nperm =3D perm; *nshared =3D shared; } else { - /* We want consistent read from backing files if the parent needs = it. - * No other operations are performed on backing files. */ - perm &=3D BLK_PERM_CONSISTENT_READ; - - /* If the parent can deal with changing data, we're okay with a - * writable and resizable backing file. */ - /* TODO Require !(perm & BLK_PERM_CONSISTENT_READ), too? */ - if (shared & BLK_PERM_WRITE) { - shared =3D BLK_PERM_WRITE | BLK_PERM_RESIZE; - } else { - shared =3D 0; - } - - shared |=3D BLK_PERM_CONSISTENT_READ | BLK_PERM_GRAPH_MOD | - BLK_PERM_WRITE_UNCHANGED; - - if (bs->open_flags & BDRV_O_INACTIVE) { - shared |=3D BLK_PERM_WRITE | BLK_PERM_RESIZE; - } - - *nperm =3D perm; - *nshared =3D shared; + bdrv_default_perms_for_backing(bs, c, child_class, role, reopen_qu= eue, + perm, shared, nperm, nshared); } } =20 --=20 2.23.0