From patchwork Fri Aug 30 12:22:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 271256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D7BA12C00C4 for ; Fri, 30 Aug 2013 22:27:29 +1000 (EST) Received: from localhost ([::1]:49663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFNnU-0005K0-1Z for incoming@patchwork.ozlabs.org; Fri, 30 Aug 2013 08:27:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFNj7-0006Uj-HO for qemu-devel@nongnu.org; Fri, 30 Aug 2013 08:23:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VFNj0-0003np-Vr for qemu-devel@nongnu.org; Fri, 30 Aug 2013 08:22:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VFNj0-0003nT-NL for qemu-devel@nongnu.org; Fri, 30 Aug 2013 08:22:50 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7UCMnaS013318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 30 Aug 2013 08:22:49 -0400 Received: from localhost (ovpn-113-148.phx2.redhat.com [10.3.113.148]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7UCMm6x015921; Fri, 30 Aug 2013 08:22:49 -0400 From: Luiz Capitulino To: anthony@codemonkey.ws Date: Fri, 30 Aug 2013 08:22:30 -0400 Message-Id: <1377865357-6742-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1377865357-6742-1-git-send-email-lcapitulino@redhat.com> References: <1377865357-6742-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 09/16] monitor: avoid direct use of global variable *mon_cmds 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 From: Wenchao Xia New member *cmd_table is added in structure Monitor to avoid direct usage of *mon_cmds. Now monitor have an associated command table, when global variable *info_cmds is also discarded, structure Monitor would gain full control about how to deal with user input. Signed-off-by: Wenchao Xia Signed-off-by: Luiz Capitulino --- monitor.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 1f645e1..ce2a1ee 100644 --- a/monitor.c +++ b/monitor.c @@ -195,6 +195,7 @@ struct Monitor { CPUState *mon_cpu; BlockDriverCompletionFunc *password_completion_cb; void *password_opaque; + mon_cmd_t *cmd_table; QError *error; QLIST_HEAD(,mon_fd_t) fds; QLIST_ENTRY(Monitor) entry; @@ -687,6 +688,8 @@ static void monitor_data_init(Monitor *mon) { memset(mon, 0, sizeof(Monitor)); mon->outbuf = qstring_new(); + /* Use *mon_cmds by default. */ + mon->cmd_table = mon_cmds; } static void monitor_data_destroy(Monitor *mon) @@ -767,7 +770,7 @@ static void help_cmd(Monitor *mon, const char *name) if (name && !strcmp(name, "info")) { help_cmd_dump(mon, info_cmds, "info ", NULL); } else { - help_cmd_dump(mon, mon_cmds, "", name); + help_cmd_dump(mon, mon->cmd_table, "", name); if (name && !strcmp(name, "log")) { const QEMULogItem *item; monitor_printf(mon, "Log items (comma separated):\n"); @@ -3995,7 +3998,7 @@ static void handle_user_command(Monitor *mon, const char *cmdline) qdict = qdict_new(); - cmd = monitor_parse_command(mon, cmdline, 0, mon_cmds, qdict); + cmd = monitor_parse_command(mon, cmdline, 0, mon->cmd_table, qdict); if (!cmd) goto out; @@ -4184,12 +4187,12 @@ static void monitor_find_completion(Monitor *mon, else cmdname = args[0]; readline_set_completion_index(mon->rs, strlen(cmdname)); - for(cmd = mon_cmds; cmd->name != NULL; cmd++) { + for (cmd = mon->cmd_table; cmd->name != NULL; cmd++) { cmd_completion(mon, cmdname, cmd->name); } } else { /* find the command */ - for (cmd = mon_cmds; cmd->name != NULL; cmd++) { + for (cmd = mon->cmd_table; cmd->name != NULL; cmd++) { if (compare_cmd(args[0], cmd->name)) { break; } @@ -4240,7 +4243,7 @@ static void monitor_find_completion(Monitor *mon, } } else if (!strcmp(cmd->name, "help|?")) { readline_set_completion_index(mon->rs, strlen(str)); - for (cmd = mon_cmds; cmd->name != NULL; cmd++) { + for (cmd = mon->cmd_table; cmd->name != NULL; cmd++) { cmd_completion(mon, str, cmd->name); } }