From patchwork Fri Aug 28 18:27:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 32423 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 bilbo.ozlabs.org (Postfix) with ESMTPS id A3263B707B for ; Sat, 29 Aug 2009 05:09:29 +1000 (EST) Received: from localhost ([127.0.0.1]:55320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6pC-0007VO-C5 for incoming@patchwork.ozlabs.org; Fri, 28 Aug 2009 15:09:26 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mh6Bq-0007oi-9L for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:46 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mh6Bl-0007m1-Jk for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:45 -0400 Received: from [199.232.76.173] (port=41307 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mh6Bl-0007lu-8j for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44308) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mh6Bk-00039g-P8 for qemu-devel@nongnu.org; Fri, 28 Aug 2009 14:28:41 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7SISdZL022228; Fri, 28 Aug 2009 14:28:40 -0400 Received: from localhost (vpn-10-114.bos.redhat.com [10.16.10.114]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7SIScmr007479; Fri, 28 Aug 2009 14:28:39 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 28 Aug 2009 15:27:22 -0300 Message-Id: <1251484052-3939-20-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> References: <1251484052-3939-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 19/29] monitor: Split monitor_handle_command() 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 In order to help the integration with unit-tests and having a better design, this commit splits monitor_handle_command() into two parts. The parsing code is moved to a function called monitor_parse_command(), while allocating memory and calling the handler is still done by monitor_handle_command(). Signed-off-by: Luiz Capitulino --- monitor.c | 73 ++++++++++++++++++++++++++++++++---------------------------- 1 files changed, 39 insertions(+), 34 deletions(-) diff --git a/monitor.c b/monitor.c index 293bc54..c4914ae 100644 --- a/monitor.c +++ b/monitor.c @@ -2590,18 +2590,18 @@ static int default_fmt_size = 4; #define MAX_ARGS 16 -static void monitor_handle_command(Monitor *mon, const char *cmdline) +static const mon_cmd_t *monitor_parse_command(Monitor *mon, + const char *cmdline, + void *str_allocated[], + QDict *qdict) { const char *p, *typestr; - int c, nb_args, i, has_arg; + int c, nb_args, has_arg; const mon_cmd_t *cmd; char cmdname[256]; char buf[1024]; char *key; - QDict *qdict; - void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; - void (*handler_d)(Monitor *mon, const QDict *qdict); #ifdef DEBUG monitor_printf(mon, "command='%s'\n", cmdline); @@ -2610,7 +2610,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) /* extract the command name */ p = get_command_name(cmdline, cmdname, sizeof(cmdname)); if (!p) - return; + return NULL; /* find the command */ for(cmd = mon_cmds; cmd->name != NULL; cmd++) { @@ -2620,14 +2620,9 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (cmd->name == NULL) { monitor_printf(mon, "unknown command: '%s'\n", cmdname); - return; + return NULL; } - qdict = qdict_new(); - - for(i = 0; i < MAX_ARGS; i++) - str_allocated[i] = NULL; - /* parse the parameters */ typestr = cmd->args_type; nb_args = 0; @@ -2872,31 +2867,41 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) goto fail; } - qemu_errors_to_mon(mon); - switch(nb_args) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 10: - handler_d = cmd->handler; - handler_d(mon, qdict); - break; - default: - monitor_printf(mon, "unsupported number of arguments: %d\n", nb_args); - break; - } - qemu_errors_to_previous(); + return cmd; - fail: +fail: qemu_free(key); - for(i = 0; i < MAX_ARGS; i++) - qemu_free(str_allocated[i]); + return NULL; +} + +static void monitor_handle_command(Monitor *mon, const char *cmdline) +{ + int i; + QDict *qdict; + const mon_cmd_t *cmd; + void *str_allocated[MAX_ARGS]; + + qdict = qdict_new(); + + for (i = 0; i < MAX_ARGS; i++) + str_allocated[i] = NULL; + + cmd = monitor_parse_command(mon, cmdline, str_allocated, qdict); + if (cmd) { + void (*handler)(Monitor *mon, const QDict *qdict); + + qemu_errors_to_mon(mon); + + handler = cmd->handler; + handler(mon, qdict); + + qemu_errors_to_previous(); + } + QDECREF(qdict); + + for (i = 0; i < MAX_ARGS; i++) + qemu_free(str_allocated[i]); } static void cmd_completion(const char *name, const char *list)