From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To9IB-0000u8-8E for qemu-devel@nongnu.org; Thu, 27 Dec 2012 03:58:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1To9IA-0004ic-1t for qemu-devel@nongnu.org; Thu, 27 Dec 2012 03:58:19 -0500 Received: from e28smtp06.in.ibm.com ([122.248.162.6]:60182) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1To9I9-0004iK-Cv for qemu-devel@nongnu.org; Thu, 27 Dec 2012 03:58:17 -0500 Received: from /spool/local by e28smtp06.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Dec 2012 14:27:16 +0530 Received: from d28relay04.in.ibm.com (d28relay04.in.ibm.com [9.184.220.61]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 2182DE004F for ; Thu, 27 Dec 2012 14:28:10 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay04.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qBR8w7r75243152 for ; Thu, 27 Dec 2012 14:28:08 +0530 Received: from d28av01.in.ibm.com (loopback [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qBR8w8x5014352 for ; Thu, 27 Dec 2012 08:58:08 GMT From: Wenchao Xia Date: Thu, 27 Dec 2012 16:56:28 +0800 Message-Id: <1356598589-5744-3-git-send-email-xiawenc@linux.vnet.ibm.com> In-Reply-To: <1356598589-5744-1-git-send-email-xiawenc@linux.vnet.ibm.com> References: <1356598589-5744-1-git-send-email-xiawenc@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH V2 2/3] HMP: add infrastructure for sub command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, armbru@redhat.com, lcapitulino@redhat.com, pbonzini@redhat.com, Wenchao Xia This patch make parsing of hmp command aware of that it may have sub command. Also discard simple encapsulation function monitor_find_command() and qmp_find_cmd(). Signed-off-by: Wenchao Xia --- monitor.c | 44 +++++++++++++++++++++++++++----------------- 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/monitor.c b/monitor.c index c7b3014..e4d4c59 100644 --- a/monitor.c +++ b/monitor.c @@ -130,6 +130,7 @@ typedef struct mon_cmd_t { MonitorCompletion *cb, void *opaque); } mhandler; int flags; + struct mon_cmd_t *sub_table; } mon_cmd_t; /* file descriptors passed via SCM_RIGHTS */ @@ -3534,21 +3535,17 @@ static const mon_cmd_t *search_dispatch_table(const mon_cmd_t *disp_table, return NULL; } -static const mon_cmd_t *monitor_find_command(const char *cmdname) -{ - return search_dispatch_table(mon_cmds, cmdname); -} - -static const mon_cmd_t *qmp_find_cmd(const char *cmdname) -{ - return search_dispatch_table(qmp_cmds, cmdname); -} - -static const mon_cmd_t *monitor_parse_command(Monitor *mon, - const char *cmdline, - QDict *qdict) +/* + * Try find the target mon_cmd_t instance, if it have sub_table and have string + * for it, this function will try search it with remain string, and if not + * found it return NULL. + */ +static const mon_cmd_t *hmp_parse_command(Monitor *mon, + const char *cmdline, + mon_cmd_t *table, + QDict *qdict) { - const char *p, *typestr; + const char *p, *p1, *typestr; int c; const mon_cmd_t *cmd; char cmdname[256]; @@ -3564,12 +3561,25 @@ static const mon_cmd_t *monitor_parse_command(Monitor *mon, if (!p) return NULL; - cmd = monitor_find_command(cmdname); + cmd = search_dispatch_table(table, cmdname); if (!cmd) { monitor_printf(mon, "unknown command: '%s'\n", cmdname); return NULL; } + /* search sub command */ + if (cmd->sub_table != NULL) { + p1 = p; + /* check if user set additional command */ + while (qemu_isspace(*p1)) { + p1++; + } + if (*p1 == '\0') { + return cmd; + } + return hmp_parse_command(mon, p, cmd->sub_table, qdict); + } + /* parse the parameters */ typestr = cmd->args_type; for(;;) { @@ -3925,7 +3935,7 @@ static void handle_user_command(Monitor *mon, const char *cmdline) qdict = qdict_new(); - cmd = monitor_parse_command(mon, cmdline, qdict); + cmd = hmp_parse_command(mon, cmdline, mon_cmds, qdict); if (!cmd) goto out; @@ -4483,7 +4493,7 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) goto err_out; } - cmd = qmp_find_cmd(cmd_name); + cmd = search_dispatch_table(qmp_cmds, cmd_name); if (!cmd) { qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); goto err_out; -- 1.7.1