From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, Wenchao Xia <xiawenc@linux.vnet.ibm.com>,
armbru@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH V8 05/13] monitor: avoid use of global *cur_mon in readline_completion()
Date: Fri, 26 Jul 2013 11:20:34 +0800 [thread overview]
Message-ID: <1374808842-11051-6-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1374808842-11051-1-git-send-email-xiawenc@linux.vnet.ibm.com>
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 <xiawenc@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
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
next prev parent reply other threads:[~2013-07-26 3:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-26 3:20 [Qemu-devel] [PATCH V8 00/13] monitor: support sub command group in auto completion and help Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 01/13] monitor: avoid use of global *cur_mon in cmd_completion() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 02/13] monitor: avoid use of global *cur_mon in file_completion() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 03/13] monitor: avoid use of global *cur_mon in block_completion_it() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 04/13] monitor: avoid use of global *cur_mon in monitor_find_completion() Wenchao Xia
2013-07-26 3:20 ` Wenchao Xia [this message]
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 06/13] monitor: avoid direct use of global variable *mon_cmds Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 07/13] monitor: code move for parse_cmdline() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 08/13] monitor: refine parse_cmdline() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 09/13] monitor: support sub command in help Wenchao Xia
2013-07-30 14:51 ` Luiz Capitulino
2013-07-31 2:23 ` Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 10/13] monitor: refine monitor_find_completion() Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 11/13] monitor: support sub command in auto completion Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 12/13] monitor: allow "help" show message for single command in sub group Wenchao Xia
2013-07-26 3:20 ` [Qemu-devel] [PATCH V8 13/13] monitor: improve auto complete of "help" " Wenchao Xia
2013-07-30 16:03 ` [Qemu-devel] [PATCH V8 00/13] monitor: support sub command group in auto completion and help Luiz Capitulino
2013-07-31 2:17 ` Wenchao Xia
2013-08-20 14:04 ` Luiz Capitulino
2013-08-21 9:17 ` Wenchao Xia
2013-08-22 9:16 ` Wenchao Xia
2013-08-22 13:12 ` Luiz Capitulino
2013-08-28 2:24 ` Wenchao Xia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374808842-11051-6-git-send-email-xiawenc@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).