From nobody Wed Nov 5 13:17:22 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534529224810552.2456061902675; Fri, 17 Aug 2018 11:07:04 -0700 (PDT) Received: from localhost ([::1]:35803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqj9L-0006jb-BG for importer@patchew.org; Fri, 17 Aug 2018 14:07:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqj7A-0004mi-Np for qemu-devel@nongnu.org; Fri, 17 Aug 2018 14:04:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqj75-0006cA-W8 for qemu-devel@nongnu.org; Fri, 17 Aug 2018 14:04:48 -0400 Received: from relay.sw.ru ([185.231.240.75]:36472) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fqj75-0006Zs-Mr; Fri, 17 Aug 2018 14:04:43 -0400 Received: from [10.28.8.145] (helo=kvm.sw.ru) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1fqj72-0000FC-GD; Fri, 17 Aug 2018 21:04:40 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Fri, 17 Aug 2018 21:04:38 +0300 Message-Id: <20180817180440.49687-1-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.11.1 In-Reply-To: <1b072083-700b-9853-e525-e2726bf17476@virtuozzo.com> References: <1b072083-700b-9853-e525-e2726bf17476@virtuozzo.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 185.231.240.75 Subject: [Qemu-devel] [PATCH v2 1/3] qapi: add x-query-block-graph X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, famz@redhat.com, ehabkost@redhat.com, jsnow@redhat.com, armbru@redhat.com, mreitz@redhat.com, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add a new command, returning block nodes graph. Signed-off-by: Vladimir Sementsov-Ogievskiy --- qapi/block-core.json | 116 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ include/block/block.h | 1 + block.c | 80 ++++++++++++++++++++++++++++++++++ blockdev.c | 5 +++ 4 files changed, 202 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index 4c7a37afdc..32398c9912 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1630,6 +1630,122 @@ { 'command': 'query-named-block-nodes', 'returns': [ 'BlockDeviceInfo' ] } =20 ## +# @BlockGraphNodeType: +# +# @block: Actual block nodes, which may be queried by query-named-block-no= des. +# @other: Not a block node. Examples: guest block device, block job. +# +# Since: 3.1 +## +{ 'enum': 'BlockGraphNodeType', + 'data': [ 'block', 'other' ] } + +## +# @BlockGraphNodeTypeBlock: +# +# Since: 3.1 +## +{ 'struct': 'BlockGraphNodeTypeBlock', + 'data': { 'node-name': 'str' } } + +## +# @BlockGraphNodeTypeOther: +# +# Since: 3.1 +## + { 'struct': 'BlockGraphNodeTypeOther', + 'data': { 'description': 'str' } } + +## +# @BlockGraphNode: +# +# @id: unique node identifier, equal to node RAM-pointer +# @type: node type +# +# Since: 3.1 +## +{ 'union': 'BlockGraphNode', + 'base': { 'id': 'uint64', 'type': 'BlockGraphNodeType' }, + 'discriminator': 'type', + 'data' : { 'block': 'BlockGraphNodeTypeBlock', + 'other': 'BlockGraphNodeTypeOther' } } + +## +# @BlockPermission: +# +# Enum of base block permissions. +# +# @consistent-read: A user that has the "permission" of consistent reads is +# guaranteed that their view of the contents of the block +# device is complete and self-consistent, representing t= he +# contents of a disk at a specific point. +# For most block devices (including their backing files)= this +# is true, but the property cannot be maintained in a few +# situations like for intermediate nodes of a commit blo= ck +# job. +# +# @write: This permission is required to change the visible disk contents. +# +# @write-unchanged: This permission (which is weaker than BLK_PERM_WRITE) = is +# both enough and required for writes to the block node = when +# the caller promises that the visible disk content does= n't +# change. +# As the BLK_PERM_WRITE permission is strictly stronger, +# either is sufficient to perform an unchanging write. +# +# @resize: This permission is required to change the size of a block node. +# +# @graph-mod: This permission is required to change the node that this +# BdrvChild points to. +# +# Since: 3.1 +## + { 'enum': 'BlockPermission', + 'data': [ 'consistent-read', 'write', 'write-unchanged', 'resize', + 'graph-mod' ] } +## +# @BlockGraphEdge: +# +# Block Graph edge description for x-query-block-graph. +# +# @parent: parent id +# +# @child: child id +# +# @name: name of the relation (examples are 'file' and 'backing') +# +# @perm: granted permissions for the parent operating on the child +# +# @shared-perm: permissions that can still be granted to other users of the +# child while it is still attached this parent +# +# Since: 3.1 +## +{ 'struct': 'BlockGraphEdge', + 'data': { 'parent': 'uint64', 'child': 'uint64', + 'name': 'str', 'perm': [ 'BlockPermission' ], + 'shared-perm': [ 'BlockPermission' ] } } + +## +# @BlockGraph: +# +# Block Graph - list of nodes and list of edges. +# +# Since: 3.1 +## +{ 'struct': 'BlockGraph', + 'data': { 'nodes': ['BlockGraphNode'], 'edges': ['BlockGraphEdge'] } } + +## +# @x-query-block-graph: +# +# Get the block graph. +# +# Since: 3.1 +## +{ 'command': 'x-query-block-graph', 'returns': 'BlockGraph' } + +## # @drive-mirror: # # Start mirroring a block device's writes to a new destination. target diff --git a/include/block/block.h b/include/block/block.h index 4e0871aaf9..6f2ccad040 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -448,6 +448,7 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag); const char *bdrv_get_format_name(BlockDriverState *bs); BlockDriverState *bdrv_find_node(const char *node_name); BlockDeviceInfoList *bdrv_named_nodes_list(Error **errp); +BlockGraph *bdrv_get_block_graph(Error **errp); BlockDriverState *bdrv_lookup_bs(const char *device, const char *node_name, Error **errp); diff --git a/block.c b/block.c index 6161dbe3eb..766354e79c 100644 --- a/block.c +++ b/block.c @@ -4003,6 +4003,86 @@ BlockDeviceInfoList *bdrv_named_nodes_list(Error **e= rrp) return list; } =20 +#define QAPI_LIST_ADD(list, element) do { \ + typeof(list) _tmp =3D g_new(typeof(*(list)), 1); \ + _tmp->value =3D (element); \ + _tmp->next =3D (list); \ + list =3D _tmp; \ +} while (0) + +BlockGraph *bdrv_get_block_graph(Error **errp) +{ + BlockGraph *graph =3D g_new0(BlockGraph, 1); + BlockDriverState *bs; + BdrvChild *child; + BlockGraphNode *node; + BlockGraphEdge *edge; + struct { + unsigned int flag; + BlockPermission num; + } 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 } + }, *p; + + QTAILQ_FOREACH(bs, &graph_bdrv_states, node_list) { + QLIST_FOREACH(child, &bs->parents, next_parent) { + if (!child->role->parent_is_bds) { + BlockGraphNodeList *el; + bool add =3D true; + + for (el =3D graph->nodes; el; el =3D el->next) { + if (el->value->id =3D=3D (uint64_t)child->opaque) { + add =3D false; + break; + } + } + + if (add) { + node =3D g_new0(BlockGraphNode, 1); + node->id =3D (uint64_t)child->opaque; + node->type =3D BLOCK_GRAPH_NODE_TYPE_OTHER; + node->u.other.description =3D + g_strdup(bdrv_child_user_desc(child)); + QAPI_LIST_ADD(graph->nodes, node); + } + } + + edge =3D g_new0(BlockGraphEdge, 1); + + edge->parent =3D (uint64_t)child->opaque; + edge->child =3D (uint64_t)bs; + assert(bs =3D=3D child->bs); + edge->name =3D g_strdup(child->name); + + for (p =3D permissions; p->flag; p++) { + if (p->flag & child->perm) { + QAPI_LIST_ADD(edge->perm, p->num); + } + if (p->flag & child->shared_perm) { + QAPI_LIST_ADD(edge->shared_perm, p->num); + } + } + + QAPI_LIST_ADD(graph->edges, edge); + } + } + + QTAILQ_FOREACH(bs, &graph_bdrv_states, node_list) { + node =3D g_new0(BlockGraphNode, 1); + node->id =3D (uint64_t)bs; + node->type =3D BLOCK_GRAPH_NODE_TYPE_BLOCK; + node->u.block.node_name =3D g_strdup(bdrv_get_node_name(bs)); + QAPI_LIST_ADD(graph->nodes, node); + } + + return graph; +} + BlockDriverState *bdrv_lookup_bs(const char *device, const char *node_name, Error **errp) diff --git a/blockdev.c b/blockdev.c index 72f5347df5..099a27d7b8 100644 --- a/blockdev.c +++ b/blockdev.c @@ -3485,6 +3485,11 @@ BlockDeviceInfoList *qmp_query_named_block_nodes(Err= or **errp) return bdrv_named_nodes_list(errp); } =20 +BlockGraph *qmp_x_query_block_graph(Error **errp) +{ + return bdrv_get_block_graph(errp); +} + BlockJob *do_blockdev_backup(BlockdevBackup *backup, JobTxn *txn, Error **errp) { --=20 2.11.1