From nobody Mon Feb 9 06:49:16 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; spf=pass (zoho.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=1560378232; cv=none; d=zoho.com; s=zohoarc; b=TB7MFpOcQhOxALgkEMYy7AmF19KFu+ubmGllIcwWh7SZLE4WTTwN1+ZB9UU6ZbKb7WsJtTlQy09LHx9gEeNA6U5MNXistJJY35FZn6c7nUZBEux6IMhWlRJXmefwbxmcHHZb6fKIjbH5YRCnF9WhDXKSpclEHI+Tgqh0cuslMBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560378232; h=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:ARC-Authentication-Results; bh=0NDPl1kBubFjrF8Wy6k2tc25rsdeP+iKePq7b3nxYe8=; b=eiUz+Dh7eoiToz3gyNVxDrLUE74CMTHPC3fh/u0w+rS61i7klZA3Jt6+C8ZUQPKdSMBMX/STZ4M0mbLeJ8eNoJL9B/exv5EG7Wr97NAKZWImV1sZe8kjqRLu6B0UX7NbJxnUqHUp1yehj7V6e4t1DvsHxxjemL3k5VdyAifo8Rk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 1560378232174770.5379048694477; Wed, 12 Jun 2019 15:23:52 -0700 (PDT) Received: from localhost ([::1]:35472 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbBem-0000f8-Pd for importer@patchew.org; Wed, 12 Jun 2019 18:23:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45476) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbBS4-0007Sv-98 for qemu-devel@nongnu.org; Wed, 12 Jun 2019 18:10:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbBS2-0007eF-Pv for qemu-devel@nongnu.org; Wed, 12 Jun 2019 18:10:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45454) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbBS0-0007YS-3K; Wed, 12 Jun 2019 18:10:36 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id A5B2C81E0E; Wed, 12 Jun 2019 22:10:32 +0000 (UTC) Received: from localhost (unknown [10.40.205.72]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 32FC7608A6; Wed, 12 Jun 2019 22:10:32 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Thu, 13 Jun 2019 00:09:32 +0200 Message-Id: <20190612221004.2317-11-mreitz@redhat.com> In-Reply-To: <20190612221004.2317-1-mreitz@redhat.com> References: <20190612221004.2317-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 12 Jun 2019 22:10:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v5 10/42] block: Use CAF in bdrv_is_encrypted() 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 , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" bdrv_is_encrypted() should not only check the BDS's backing child, but any filtered child: If a filter's child is encrypted, the filter node itself naturally is encrypted, too. Furthermore, we need to recurse down the chain. (CAF means child access function.) Signed-off-by: Max Reitz --- block.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 45882a3470..567a0f82c8 100644 --- a/block.c +++ b/block.c @@ -4574,10 +4574,14 @@ bool bdrv_is_sg(BlockDriverState *bs) =20 bool bdrv_is_encrypted(BlockDriverState *bs) { - if (bs->backing && bs->backing->bs->encrypted) { + BlockDriverState *filtered =3D bdrv_filtered_bs(bs); + if (bs->encrypted) { return true; } - return bs->encrypted; + if (filtered && bdrv_is_encrypted(filtered)) { + return true; + } + return false; } =20 const char *bdrv_get_format_name(BlockDriverState *bs) --=20 2.21.0