From patchwork Wed Sep 28 14:44:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 116817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AAE8D1007D2 for ; Thu, 29 Sep 2011 01:12:10 +1000 (EST) Received: from localhost ([::1]:52401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8vPI-0006PL-9B for incoming@patchwork.ozlabs.org; Wed, 28 Sep 2011 10:46:44 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8vO2-0003He-Gf for qemu-devel@nongnu.org; Wed, 28 Sep 2011 10:45:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R8vNw-0004yv-J7 for qemu-devel@nongnu.org; Wed, 28 Sep 2011 10:45:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1305) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R8vNw-0004yo-BS for qemu-devel@nongnu.org; Wed, 28 Sep 2011 10:45:20 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p8SEjI6U003550 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 28 Sep 2011 10:45:18 -0400 Received: from localhost (ovpn-113-147.phx2.redhat.com [10.3.113.147]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p8SEjH4S007953; Wed, 28 Sep 2011 10:45:17 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 28 Sep 2011 11:44:41 -0300 Message-Id: <1317221085-5825-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1317221085-5825-1-git-send-email-lcapitulino@redhat.com> References: <1317221085-5825-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 17/21] qapi: Convert query-commands 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: Luiz Capitulino Reviewed-by: Michael Roth Tested-by: Michael Roth --- monitor.c | 40 +++++++++++++++------------------------- qapi-schema.json | 23 +++++++++++++++++++++++ qmp-commands.hx | 6 ++++++ 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/monitor.c b/monitor.c index 66b3004..d546bad 100644 --- a/monitor.c +++ b/monitor.c @@ -730,39 +730,37 @@ help: help_cmd(mon, "info"); } -static QObject *get_cmd_dict(const char *name) +static CommandInfoList *alloc_cmd_entry(const char *cmd_name) { - const char *p; + CommandInfoList *info; - /* Remove '|' from some commands */ - p = strchr(name, '|'); - if (p) { - p++; - } else { - p = name; - } + info = g_malloc0(sizeof(*info)); + info->value = g_malloc0(sizeof(*info->value)); + info->value->name = g_strdup(cmd_name); - return qobject_from_jsonf("{ 'name': %s }", p); + return info; } -static void do_info_commands(Monitor *mon, QObject **ret_data) +CommandInfoList *qmp_query_commands(Error **errp) { - QList *cmd_list; + CommandInfoList *info, *cmd_list = NULL; const mon_cmd_t *cmd; - cmd_list = qlist_new(); - for (cmd = qmp_cmds; cmd->name != NULL; cmd++) { - qlist_append_obj(cmd_list, get_cmd_dict(cmd->name)); + info = alloc_cmd_entry(cmd->name); + info->next = cmd_list; + cmd_list = info; } for (cmd = qmp_query_cmds; cmd->name != NULL; cmd++) { char buf[128]; snprintf(buf, sizeof(buf), "query-%s", cmd->name); - qlist_append_obj(cmd_list, get_cmd_dict(buf)); + info = alloc_cmd_entry(buf); + info->next = cmd_list; + cmd_list = info; } - *ret_data = QOBJECT(cmd_list); + return cmd_list; } /* get the current CPU defined by the user */ @@ -3051,14 +3049,6 @@ static const mon_cmd_t qmp_cmds[] = { static const mon_cmd_t qmp_query_cmds[] = { { - .name = "commands", - .args_type = "", - .params = "", - .help = "list QMP available commands", - .user_print = monitor_user_noop, - .mhandler.info_new = do_info_commands, - }, - { .name = "block", .args_type = "", .params = "", diff --git a/qapi-schema.json b/qapi-schema.json index 2ebcb1c..b26dd25 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -202,3 +202,26 @@ # Since: 0.14.0 ## { 'command': 'query-chardev', 'returns': ['ChardevInfo'] } + +## +# @CommandInfo: +# +# Information about a QMP command +# +# @name: The command name +# +# Since: 0.14.0 +## +{ 'type': 'CommandInfo', 'data': {'name': 'str'} } + +## +# @query-commands: +# +# Return a list of supported QMP commands by this server +# +# Returns: A list of @CommandInfo for all supported commands +# +# Since: 0.14.0 +## +{ 'command': 'query-commands', 'returns': ['CommandInfo'] } + diff --git a/qmp-commands.hx b/qmp-commands.hx index dfc02af..0fda5c3 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -1090,6 +1090,12 @@ Note: This example has been shortened as the real response is too long. EQMP + { + .name = "query-commands", + .args_type = "", + .mhandler.cmd_new = qmp_marshal_input_query_commands, + }, + SQMP query-chardev -------------