From patchwork Thu Mar 24 03:17:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 8656901 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 62ACAC0553 for ; Thu, 24 Mar 2016 03:16:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA16120340 for ; Thu, 24 Mar 2016 03:15:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 06534202E5 for ; Thu, 24 Mar 2016 03:15:59 +0000 (UTC) Received: from localhost ([::1]:47289 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aivkc-00008Q-0F for patchwork-qemu-devel@patchwork.kernel.org; Wed, 23 Mar 2016 23:15:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aivkV-00008F-5N for qemu-devel@nongnu.org; Wed, 23 Mar 2016 23:15:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aivkR-0005tl-TT for qemu-devel@nongnu.org; Wed, 23 Mar 2016 23:15:51 -0400 Received: from [59.151.112.132] (port=11630 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aivkR-0005ta-Fi for qemu-devel@nongnu.org; Wed, 23 Mar 2016 23:15:47 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="4912524" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 24 Mar 2016 11:15:45 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 2FD69408D264; Thu, 24 Mar 2016 11:15:40 +0800 (CST) Received: from [10.167.226.52] (10.167.226.52) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server id 14.3.279.2; Thu, 24 Mar 2016 11:15:39 +0800 To: qemu-devl , Max Reitz , Alberto Garcia , "Dr. David Alan Gilbert" , Kevin Wolf From: Wen Congyang Message-ID: <56F35C38.3040804@cn.fujitsu.com> Date: Thu, 24 Mar 2016 11:17:12 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 X-Originating-IP: [10.167.226.52] X-yoursite-MailScanner-ID: 2FD69408D264.A725F X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: wency@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Cc: Changlong Xie , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH] quorum: Implement bdrv_get_specific_info 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The monitor command 'query-block' or 'info block' will output the format specific information. So we can get each child's child-name after this patch. This useful for dynamic reconfiguration. Signed-off-by: Wen Congyang --- block/quorum.c | 27 +++++++++++++++++++++++++++ qapi/block-core.json | 15 ++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/block/quorum.c b/block/quorum.c index da15465..afe6c3f 100644 --- a/block/quorum.c +++ b/block/quorum.c @@ -1054,6 +1054,31 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options) bs->full_open_options = opts; } +static ImageInfoSpecific *quorum_get_specific_info(BlockDriverState *bs) +{ + int i; + BDRVQuorumState *s = bs->opaque; + ImageInfoSpecific *spec_info = g_new0(ImageInfoSpecific, 1); + strList **next; + + *spec_info = (ImageInfoSpecific){ + .type = IMAGE_INFO_SPECIFIC_KIND_QUORUM, + .u = { + .quorum.data = g_new0(ImageInfoSpecificQuorum, 1), + }, + }; + + next = &spec_info->u.quorum.data->child_name; + for (i = 0; i < s->num_children; i++) { + *next = g_new0(strList, 1); + (*next)->value = g_strdup(s->children[i]->name); + (*next)->next = NULL; + next = &(*next)->next; + } + + return spec_info; +} + static BlockDriver bdrv_quorum = { .format_name = "quorum", .protocol_name = "quorum", @@ -1077,6 +1102,8 @@ static BlockDriver bdrv_quorum = { .is_filter = true, .bdrv_recurse_is_first_non_filter = quorum_recurse_is_first_non_filter, + + .bdrv_get_specific_info = quorum_get_specific_info, }; static void bdrv_quorum_init(void) diff --git a/qapi/block-core.json b/qapi/block-core.json index b1cf77d..bd3e12d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -75,6 +75,18 @@ } } ## +# @ImageInfoSpecificQuorum: +# +# @child-name: List of child name +# +# Since: 2.7 +## +{ 'struct': 'ImageInfoSpecificQuorum', + 'data': { + 'child-name': ['str'] + } } + +## # @ImageInfoSpecific: # # A discriminated record of image format specific information structures. @@ -85,7 +97,8 @@ { 'union': 'ImageInfoSpecific', 'data': { 'qcow2': 'ImageInfoSpecificQCow2', - 'vmdk': 'ImageInfoSpecificVmdk' + 'vmdk': 'ImageInfoSpecificVmdk', + 'quorum': 'ImageInfoSpecificQuorum' } } ##