From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4FCDC34026 for ; Tue, 18 Feb 2020 12:56:57 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E0192176D for ; Tue, 18 Feb 2020 12:56:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EhjeD6rq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E0192176D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j42Qq-0002fd-JY for qemu-devel@archiver.kernel.org; Tue, 18 Feb 2020 07:56:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39285) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j42E8-0005fa-N3 for qemu-devel@nongnu.org; Tue, 18 Feb 2020 07:43:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j42E7-0001YH-Cg for qemu-devel@nongnu.org; Tue, 18 Feb 2020 07:43:48 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:22957 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j42E7-0001Xp-8Z for qemu-devel@nongnu.org; Tue, 18 Feb 2020 07:43:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582029826; 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=izpavJESRAm3sR19Ew5wdtfqWi7jEspf/lYr342uxIk=; b=EhjeD6rqakNOChTy/F7jSZ4j+OzCOlAnU8mDxNI4rrp0JXO3mzpXqEdk35EcyipFkcdGn4 rEbkdZMwEso6vWedVMcw/gdWoCm6ZCcDMZv+pkndJCCK1/bA1CTr9z3MoMA76PrTRfxa+3 tFSmU6fO09ZYSAJiAjg8mktfcHze2/I= 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-272-8gQ0xmjsO6euVpIgEgKJUA-1; Tue, 18 Feb 2020 07:43:44 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 095AB100550E; Tue, 18 Feb 2020 12:43:44 +0000 (UTC) Received: from localhost (unknown [10.36.118.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 71B53384; Tue, 18 Feb 2020 12:43:43 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH v3 18/33] block: Add bdrv_default_perms() Date: Tue, 18 Feb 2020 13:42:27 +0100 Message-Id: <20200218124242.584644-19-mreitz@redhat.com> In-Reply-To: <20200218124242.584644-1-mreitz@redhat.com> References: <20200218124242.584644-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: 8gQ0xmjsO6euVpIgEgKJUA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This callback can be used by BDSs that use child_of_bds with the appropriate BdrvChildRole for their children. Also, make bdrv_format_default_perms() use it for child_of_bds children (just a temporary solution until we can drop bdrv_format_default_perms() altogether). Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block.c | 46 ++++++++++++++++++++++++++++++++------- include/block/block_int.h | 11 ++++++++++ 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/block.c b/block.c index c0ba274743..3e5b0bc345 100644 --- a/block.c +++ b/block.c @@ -2383,14 +2383,12 @@ static void bdrv_default_perms_for_metadata(BlockDr= iverState *bs, BdrvChild *c, *nshared =3D shared; } =20 -/* TODO: Use */ -static void __attribute__((unused)) -bdrv_default_perms_for_data(BlockDriverState *bs, BdrvChild *c, - const BdrvChildClass *child_class, - BdrvChildRole role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nshared) +static void bdrv_default_perms_for_data(BlockDriverState *bs, BdrvChild *c= , + const BdrvChildClass *child_class, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared= ) { assert(child_class =3D=3D &child_of_bds && (role & BDRV_CHILD_DATA)); =20 @@ -2425,6 +2423,13 @@ void bdrv_format_default_perms(BlockDriverState *bs,= BdrvChild *c, uint64_t *nperm, uint64_t *nshared) { bool backing =3D (child_class =3D=3D &child_backing); + + if (child_class =3D=3D &child_of_bds) { + bdrv_default_perms(bs, c, child_class, role, reopen_queue, + perm, shared, nperm, nshared); + return; + } + assert(child_class =3D=3D &child_backing || child_class =3D=3D &child_= file); =20 if (!backing) { @@ -2436,6 +2441,31 @@ void bdrv_format_default_perms(BlockDriverState *bs,= BdrvChild *c, } } =20 +void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c, + const BdrvChildClass *child_class, BdrvChildRole r= ole, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + assert(child_class =3D=3D &child_of_bds); + + if (role & BDRV_CHILD_FILTERED) { + bdrv_filter_default_perms(bs, c, child_class, role, reopen_queue, + perm, shared, nperm, nshared); + } else if (role & BDRV_CHILD_COW) { + bdrv_default_perms_for_backing(bs, c, child_class, role, reopen_qu= eue, + perm, shared, nperm, nshared); + } else if (role & BDRV_CHILD_METADATA) { + bdrv_default_perms_for_metadata(bs, c, child_class, role, reopen_q= ueue, + perm, shared, nperm, nshared); + } else if (role & BDRV_CHILD_DATA) { + bdrv_default_perms_for_data(bs, c, child_class, role, reopen_queue= , + perm, shared, nperm, nshared); + } else { + g_assert_not_reached(); + } +} + uint64_t bdrv_qapi_perm_to_blk_perm(BlockPermission qapi_perm) { static const uint64_t permissions[] =3D { diff --git a/include/block/block_int.h b/include/block/block_int.h index dd7ccea35e..d1d1af2a5c 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1279,6 +1279,17 @@ void bdrv_format_default_perms(BlockDriverState *bs,= BdrvChild *c, bool bdrv_recurse_can_replace(BlockDriverState *bs, BlockDriverState *to_replace); =20 +/* + * Default implementation for BlockDriver.bdrv_child_perm() that can + * be used by block filters and image formats, as long as they use the + * child_of_bds child class and set an appropriate BdrvChildRole. + */ +void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c, + const BdrvChildClass *child_class, BdrvChildRole r= ole, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared); + /* * Default implementation for drivers to pass bdrv_co_block_status() to * their file. --=20 2.24.1