[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V5 2/7] monitor: avoid direct use of global vari
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH V5 2/7] monitor: avoid direct use of global variable *mon_cmds |
Date: |
Mon, 8 Jul 2013 11:29:48 -0400 |
On Sat, 29 Jun 2013 11:52:56 +0800
Wenchao Xia <address@hidden> wrote:
> 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 <address@hidden>
> Reviewed-by: Eric Blake <address@hidden>
> ---
> monitor.c | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/monitor.c b/monitor.c
> index 29e3a95..68e2e80 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -194,6 +194,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;
> @@ -749,7 +750,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");
> @@ -3974,7 +3975,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;
>
> @@ -4163,12 +4164,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;
> }
> @@ -4219,7 +4220,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);
> }
> }
> @@ -4782,6 +4783,9 @@ void monitor_init(CharDriverState *chr, int flags)
> if (!default_mon || (flags & MONITOR_IS_DEFAULT))
> default_mon = mon;
>
> + /* Always use *mon_cmds as root command table now. */
If you mean it's the default, I'd just say that.
> + mon->cmd_table = mon_cmds;
> +
> sortcmdlist();
> }
>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- Re: [Qemu-devel] [PATCH V5 2/7] monitor: avoid direct use of global variable *mon_cmds,
Luiz Capitulino <=