From patchwork Fri Nov 27 00:58:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 39597 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5F2AD1007D1 for ; Fri, 27 Nov 2009 12:09:59 +1100 (EST) Received: from localhost ([127.0.0.1]:43808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpLQ-0006jG-GV for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 20:09:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDpBT-0001e0-5j for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDpBO-0001bl-Ms for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:38 -0500 Received: from [199.232.76.173] (port=48290 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpBO-0001bX-DM for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59064) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDpBN-0004Ph-U2 for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:34 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAR0xWut032338 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Nov 2009 19:59:33 -0500 Received: from localhost (vpn-10-232.rdu.redhat.com [10.11.10.232]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAR0xVwP004995; Thu, 26 Nov 2009 19:59:32 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 22:58:56 -0200 Message-Id: <1259283550-3597-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> References: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 06/20] monitor: Introduce 'info commands' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org List QMP available commands. Only valid in control mode, where has to be used as 'query-commands. Signed-off-by: Luiz Capitulino --- monitor.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 4c402e4..02dea2e 100644 --- a/monitor.c +++ b/monitor.c @@ -363,6 +363,35 @@ static void do_info_version(Monitor *mon, QObject **ret_data) } /** + * do_info_commands(): List QMP available commands + * + * Return a QList of QStrings. + */ +static void do_info_commands(Monitor *mon, QObject **ret_data) +{ + QList *cmd_list; + const mon_cmd_t *cmd; + + cmd_list = qlist_new(); + + for (cmd = mon_cmds; cmd->name != NULL; cmd++) { + if (monitor_handler_ported(cmd) && !compare_cmd(cmd->name, "info")) { + qlist_append(cmd_list, qstring_from_str(cmd->name)); + } + } + + for (cmd = info_cmds; cmd->name != NULL; cmd++) { + if (monitor_handler_ported(cmd)) { + char buf[128]; + snprintf(buf, sizeof(buf), "query-%s", cmd->name); + qlist_append(cmd_list, qstring_from_str(buf)); + } + } + + *ret_data = QOBJECT(cmd_list); +} + +/** * do_info_name(): Show VM name * * Return a QString with the current VM name. @@ -2047,6 +2076,14 @@ static const mon_cmd_t info_cmds[] = { .mhandler.info_new = do_info_version, }, { + .name = "commands", + .args_type = "", + .params = "", + .help = "list QMP available commands", + .user_print = monitor_user_noop, + .mhandler.info_new = do_info_commands, + }, + { .name = "network", .args_type = "", .params = "",