From nobody Mon Feb 9 07:22:38 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; dkim=fail; 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=1573216632; cv=none; d=zoho.com; s=zohoarc; b=jyreXsR1lXZMFu/OCdnXqE4u4Bs5qYCKtZHXIGOme1gI+/ckGmrh+kovU1wgtMcyw2o8o9/jtH1XOC52Ky2v5dyujckRGeuQnDAARtksrpoJhyIGHPuv3/jpTKLBtPke4ZlKfuohtFZXFmoV6k9z8PX12mOL18aliHHI3PbI2Zk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573216632; 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=oxnnNO6K+9iLDzwL1oPBiucVaNMfMzLQ28KNK8wvARs=; b=c2uWIVIO2sTYKmyf6bTEaHLqmPVWinxzxRKyYJVgM0+Nkf5K2nvoDDV3Wnp5KxowF2nD9XlPukhBGNJOT20qGVrMh9TPsazXfuVpopVQSBhUuZg9pLbDvWlxzZWhdn/uiBdOWqMyWuOhBQ2PeyhEnQ382AvwNu2OqsmVaKNY8SY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1573216632524365.79734527878816; Fri, 8 Nov 2019 04:37:12 -0800 (PST) Received: from localhost ([::1]:53162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT3Vm-0004A9-ME for importer@patchew.org; Fri, 08 Nov 2019 07:37:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44713) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT3Ts-0002Yg-6j for qemu-devel@nongnu.org; Fri, 08 Nov 2019 07:35:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT3Tq-0003Jz-3J for qemu-devel@nongnu.org; Fri, 08 Nov 2019 07:35:12 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:22599 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 1iT3To-0003HY-7T for qemu-devel@nongnu.org; Fri, 08 Nov 2019 07:35:08 -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-97-WzZxtrfxPWaJJQWUvFLm7Q-1; Fri, 08 Nov 2019 07:35:02 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3D505800C72; Fri, 8 Nov 2019 12:35:01 +0000 (UTC) Received: from localhost (ovpn-117-78.ams2.redhat.com [10.36.117.78]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D2DA05D6AE; Fri, 8 Nov 2019 12:35:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573216506; 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=oxnnNO6K+9iLDzwL1oPBiucVaNMfMzLQ28KNK8wvARs=; b=a2z1Q+2falaqnm9NRtizgTd7VT+XGfOxLvhgHBFsvwBeqY4lUoLgbrWC2TxZ/8T+BleBjI knHTgSXUrANBrTHcIiRU0Atulz727vXwMtAHRZ+HYyitLwgUzNua6SfE15ywz47oAAF7hC AWKvyKpfpj9m0QOTJohsxcgjdIaEzQA= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH for-5.0 v4 2/5] block: Use bdrv_qapi_perm_to_blk_perm() Date: Fri, 8 Nov 2019 13:34:52 +0100 Message-Id: <20191108123455.39445-3-mreitz@redhat.com> In-Reply-To: <20191108123455.39445-1-mreitz@redhat.com> References: <20191108123455.39445-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: WzZxtrfxPWaJJQWUvFLm7Q-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: 207.211.31.81 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" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We can save some LoC in xdbg_graph_add_edge() by using bdrv_qapi_perm_to_blk_perm(). Signed-off-by: Max Reitz Reviewed-by: Vladimir Sementsov-Ogievskiy --- block.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/block.c b/block.c index 066433f3e2..ae279ff21f 100644 --- a/block.c +++ b/block.c @@ -4870,36 +4870,23 @@ static void xdbg_graph_add_node(XDbgBlockGraphConst= ructor *gr, void *node, static void xdbg_graph_add_edge(XDbgBlockGraphConstructor *gr, void *paren= t, const BdrvChild *child) { - typedef struct { - unsigned int flag; - BlockPermission num; - } PermissionMap; - - static const PermissionMap permissions[] =3D { - { BLK_PERM_CONSISTENT_READ, BLOCK_PERMISSION_CONSISTENT_READ }, - { BLK_PERM_WRITE, BLOCK_PERMISSION_WRITE }, - { BLK_PERM_WRITE_UNCHANGED, BLOCK_PERMISSION_WRITE_UNCHANGED }, - { BLK_PERM_RESIZE, BLOCK_PERMISSION_RESIZE }, - { BLK_PERM_GRAPH_MOD, BLOCK_PERMISSION_GRAPH_MOD }, - { 0, 0 } - }; - const PermissionMap *p; + BlockPermission qapi_perm; XDbgBlockGraphEdge *edge; =20 - QEMU_BUILD_BUG_ON(1UL << (ARRAY_SIZE(permissions) - 1) !=3D BLK_PERM_A= LL + 1); - edge =3D g_new0(XDbgBlockGraphEdge, 1); =20 edge->parent =3D xdbg_graph_node_num(gr, parent); edge->child =3D xdbg_graph_node_num(gr, child->bs); edge->name =3D g_strdup(child->name); =20 - for (p =3D permissions; p->flag; p++) { - if (p->flag & child->perm) { - QAPI_LIST_ADD(edge->perm, p->num); + for (qapi_perm =3D 0; qapi_perm < BLOCK_PERMISSION__MAX; qapi_perm++) { + uint64_t flag =3D bdrv_qapi_perm_to_blk_perm(qapi_perm); + + if (flag & child->perm) { + QAPI_LIST_ADD(edge->perm, qapi_perm); } - if (p->flag & child->shared_perm) { - QAPI_LIST_ADD(edge->shared_perm, p->num); + if (flag & child->shared_perm) { + QAPI_LIST_ADD(edge->shared_perm, qapi_perm); } } =20 --=20 2.23.0