From patchwork Thu Dec 5 17:14:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Canet?= X-Patchwork-Id: 297213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3B6762C0090 for ; Fri, 6 Dec 2013 04:17:30 +1100 (EST) Received: from localhost ([::1]:54805 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocYJ-00029U-Qn for incoming@patchwork.ozlabs.org; Thu, 05 Dec 2013 12:17:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocWl-0000GS-9i for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VocWg-0000lX-82 for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:51 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:44900 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VocWf-0000lM-O6 for qemu-devel@nongnu.org; Thu, 05 Dec 2013 12:15:46 -0500 Received: by paradis.irqsave.net (Postfix, from userid 108) id 867B64245E; Thu, 5 Dec 2013 18:20:39 +0100 (CET) Received: from localhost.localdomain (unknown [192.168.77.2]) by paradis.irqsave.net (Postfix) with ESMTP id 1019D42433; Thu, 5 Dec 2013 18:19:59 +0100 (CET) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= To: qemu-devel@nongnu.org Date: Thu, 5 Dec 2013 18:14:59 +0100 Message-Id: <1386263703-19292-4-git-send-email-benoit@irqsave.net> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386263703-19292-1-git-send-email-benoit@irqsave.net> References: <1386263703-19292-1-git-send-email-benoit@irqsave.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 62.212.105.220 Cc: kwolf@redhat.com, famz@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , jcody@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH V4 3/7] qmp: Add a command to list the named BlockDriverState nodes. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Benoit Canet --- block.c | 16 ++++++++++++++++ blockdev.c | 5 +++++ include/block/block.h | 1 + qapi-schema.json | 11 +++++++++++ qmp-commands.hx | 19 +++++++++++++++++++ 5 files changed, 52 insertions(+) diff --git a/block.c b/block.c index 61f5ba0..372aa3b 100644 --- a/block.c +++ b/block.c @@ -3178,6 +3178,22 @@ BlockDriverState *bdrv_find_node(const char *node_name) return NULL; } +strList *bdrv_named_nodes_list(void) +{ + strList *str_list, *entry; + BlockDriverState *bs; + + str_list = NULL; + QTAILQ_FOREACH(bs, &graph_bdrv_states, node_list) { + entry = g_malloc0(sizeof(*entry)); + entry->value = g_strdup(bs->node_name); + entry->next = str_list; + str_list = entry; + } + + return str_list; +} + BlockDriverState *bdrv_next(BlockDriverState *bs) { if (!bs) { diff --git a/blockdev.c b/blockdev.c index a474bb5..1eb4639 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1940,6 +1940,11 @@ void qmp_drive_backup(const char *device, const char *target, } } +strList *qmp_query_named_block_nodes(Error **errp) +{ + return bdrv_named_nodes_list(); +} + #define DEFAULT_MIRROR_BUF_SIZE (10 << 20) void qmp_drive_mirror(const char *device, const char *target, diff --git a/include/block/block.h b/include/block/block.h index 6426ca6..fe642d9 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -371,6 +371,7 @@ void bdrv_eject(BlockDriverState *bs, bool eject_flag); const char *bdrv_get_format_name(BlockDriverState *bs); BlockDriverState *bdrv_find(const char *name); BlockDriverState *bdrv_find_node(const char *node_name); +strList *bdrv_named_nodes_list(void); BlockDriverState *bdrv_next(BlockDriverState *bs); void bdrv_iterate(void (*it)(void *opaque, BlockDriverState *bs), void *opaque); diff --git a/qapi-schema.json b/qapi-schema.json index 8630eb5..3a4a4c8 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2008,6 +2008,17 @@ { 'command': 'drive-backup', 'data': 'DriveBackup' } ## +# @query-named-block-nodes +# +# Get the named block driver list +# +# Returns: the list of named nodes names +# +# Since 2.0 +## +{ 'command': 'query-named-block-nodes', 'returns': [ 'str' ] } + +## # @drive-mirror # # Start mirroring a block device's writes to a new destination. diff --git a/qmp-commands.hx b/qmp-commands.hx index fba15cd..107795b 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -3295,3 +3295,22 @@ Example (2): <- { "return": {} } EQMP + + { + .name = "query-named-block-nodes", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_named_block_nodes, + }, + +SQMP +@query-named-block-nodes +------------------------ + +Return a list of string containing the name of the named block driver states + +Example: + +-> { "execute": "query-named-block-nodes" } +<- { "return": [ "quorum1.qcow2", "quorum2.qcow2", "quorum3.qcow2" ] } + +EQMP