[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V7 05/13] monitor: avoid use of global *cur_mon in r
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V7 05/13] monitor: avoid use of global *cur_mon in readline_completion() |
Date: |
Sat, 20 Jul 2013 09:44:07 +0800 |
Now all completion functions do not use *cur_mon any more, instead
they use rs->mon. In short, structure ReadLineState decide where
the complete action would be taken now.
Tested with the case that qemu have two telnet monitors, auto
completion function works normal.
Signed-off-by: Wenchao Xia <address@hidden>
---
readline.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/readline.c b/readline.c
index c91b324..abf27dd 100644
--- a/readline.c
+++ b/readline.c
@@ -276,7 +276,6 @@ void readline_set_completion_index(ReadLineState *rs, int
index)
static void readline_completion(ReadLineState *rs)
{
- Monitor *mon = cur_mon;
int len, i, j, max_width, nb_cols, max_prefix;
char *cmdline;
@@ -300,7 +299,7 @@ static void readline_completion(ReadLineState *rs)
if (len > 0 && rs->completions[0][len - 1] != '/')
readline_insert_char(rs, ' ');
} else {
- monitor_printf(mon, "\n");
+ monitor_printf(rs->mon, "\n");
max_width = 0;
max_prefix = 0;
for(i = 0; i < rs->nb_completions; i++) {
--
1.7.1
- [Qemu-devel] [PATCH V7 00/13] monitor: support sub command group in auto completion and help, Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 02/13] monitor: avoid use of global *cur_mon in file_completion(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 01/13] monitor: avoid use of global *cur_mon in cmd_completion(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 03/13] monitor: avoid use of global *cur_mon in block_completion_it(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 04/13] monitor: avoid use of global *cur_mon in monitor_find_completion(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 05/13] monitor: avoid use of global *cur_mon in readline_completion(),
Wenchao Xia <=
- [Qemu-devel] [PATCH V7 06/13] monitor: avoid direct use of global variable *mon_cmds, Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 07/13] monitor: code move for parse_cmdline(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 08/13] monitor: refine parse_cmdline(), Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 09/13] monitor: support sub command in help, Wenchao Xia, 2013/07/19
- [Qemu-devel] [PATCH V7 10/13] monitor: refine monitor_find_completion(), Wenchao Xia, 2013/07/19