From nobody Tue Apr 15 04:36:17 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=1589548672; cv=none; d=zohomail.com; s=zohoarc; b=hRPTOybVbjiIHvaIuQPMxfrPt5LsO/0cQRnVZqsN88J+5t8loqCC7He/cgo8YNgejtaajbdF1Oxs0lBzTclcYleifd7/AlOSZv5oVm7i7xA80PHiviMR4AlNpNO+eQZoclbT2kGMEo7QFkV7cEZozNoZlgLnWJyd7qa5P4VV0oo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589548672; 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=gwvoMeDp5/atI7Q3+wOTVC/LfaWZAnTD2JUMyjBjAaY=; b=XN5KSNgJcSUucCakwD7tr+V2iKfugq/fM1jaOjNSZ2U83S4MHZpiXWrRuiamhKe9nMPzuwTSYHbXhuFEjOIjD2fByanwszJxHEDNICRSkVHDIAUrEOl2sDifq0GHC93+DyYEAo26Qz1B6/E3gKeH1ECfsE9EoVezirHzZSpmNA8= 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 1589548672427692.3425805147524; Fri, 15 May 2020 06:17:52 -0700 (PDT) Received: from localhost ([::1]:56634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZaDn-0003pX-2N for importer@patchew.org; Fri, 15 May 2020 09:17:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZZjb-0003oL-NB for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:39 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:55115 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jZZjZ-0002T3-J1 for qemu-devel@nongnu.org; Fri, 15 May 2020 08:46:39 -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-315-EDu2QyhfOnK0Ck91b1PZSA-1; Fri, 15 May 2020 08:46:31 -0400 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 BD3A0100CCC4; Fri, 15 May 2020 12:46:30 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-113-110.ams2.redhat.com [10.36.113.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id C52692E024; Fri, 15 May 2020 12:46:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589546795; 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=gwvoMeDp5/atI7Q3+wOTVC/LfaWZAnTD2JUMyjBjAaY=; b=OeHQK9FmUblJAyHMOnFLS/P5Mpp9F/zBZJTu7N/aELD1v06WSr2pGYrNpvU2LiT01hTGt1 7ZuiKTRuOd6fiXRgoqEI4L1N/HRG6EodnyC8+NVFqwN1n/6qggCqT26MdhVEC0GigTrwuK hU9r1TOfG/MPpTHMPcbfafEe5ttMwgo= X-MC-Unique: EDu2QyhfOnK0Ck91b1PZSA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 43/51] block: Drop bdrv_format_default_perms() Date: Fri, 15 May 2020 14:45:13 +0200 Message-Id: <20200515124521.335403-44-kwolf@redhat.com> In-Reply-To: <20200515124521.335403-1-kwolf@redhat.com> References: <20200515124521.335403-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=207.211.31.81; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 00:39:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: Max Reitz Signed-off-by: Max Reitz Reviewed-by: Eric Blake Message-Id: <20200513110544.176672-32-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- include/block/block_int.h | 11 ----------- block.c | 19 ------------------- 2 files changed, 30 deletions(-) diff --git a/include/block/block_int.h b/include/block/block_int.h index 6fc5f0d333..e791c40496 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1262,17 +1262,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t p= erm, uint64_t shared, */ int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **e= rrp); =20 -/* Default implementation for BlockDriver.bdrv_child_perm() that can be us= ed by - * (non-raw) image formats: Like above for bs->backing, but for bs->file it - * requires WRITE | RESIZE for read-write images, always requires - * CONSISTENT_READ and doesn't share WRITE. */ -void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, - const BdrvChildClass *child_class, - BdrvChildRole child_role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nshared); - bool bdrv_recurse_can_replace(BlockDriverState *bs, BlockDriverState *to_replace); =20 diff --git a/block.c b/block.c index 54bc1c3b2d..e79fe6e07e 100644 --- a/block.c +++ b/block.c @@ -2517,25 +2517,6 @@ static void bdrv_default_perms_for_storage(BlockDriv= erState *bs, BdrvChild *c, *nshared =3D shared; } =20 -void bdrv_format_default_perms(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) -{ - 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_file); - - bdrv_default_perms_for_storage(bs, c, child_class, role, reopen_queue, - perm, shared, nperm, nshared); -} - void bdrv_default_perms(BlockDriverState *bs, BdrvChild *c, const BdrvChildClass *child_class, BdrvChildRole r= ole, BlockReopenQueue *reopen_queue, --=20 2.25.4