qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
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 V9 05/15] monitor: avoid use of global *cur_mon in readline_completion()
Date: Fri, 23 Aug 2013 16:17:57 +0800	[thread overview]
Message-ID: <1377245887-22745-6-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1377245887-22745-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

  parent reply	other threads:[~2013-08-23  8:20 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-23  8:17 [Qemu-devel] [PATCH V9 00/15] monitor: support sub command group in auto completion and help Wenchao Xia
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 01/15] monitor: avoid use of global *cur_mon in cmd_completion() Wenchao Xia
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 02/15] monitor: avoid use of global *cur_mon in file_completion() Wenchao Xia
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 03/15] monitor: avoid use of global *cur_mon in block_completion_it() Wenchao Xia
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 04/15] monitor: avoid use of global *cur_mon in monitor_find_completion() Wenchao Xia
2013-08-23  8:17 ` Wenchao Xia [this message]
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 06/15] monitor: call sortcmdlist() only one time Wenchao Xia
2013-08-23  8:17 ` [Qemu-devel] [PATCH V9 07/15] monitor: split off monitor_data_init() Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 08/15] monitor: avoid direct use of global variable *mon_cmds Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 09/15] monitor: code move for parse_cmdline() Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 10/15] monitor: refine parse_cmdline() Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 11/15] monitor: support sub command in help Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 12/15] monitor: refine monitor_find_completion() Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 13/15] monitor: support sub command in auto completion Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 14/15] monitor: allow "help" show message for single command in sub group Wenchao Xia
2013-08-23  8:18 ` [Qemu-devel] [PATCH V9 15/15] monitor: improve auto complete of "help" " Wenchao Xia
2013-08-26 15:55 ` [Qemu-devel] [PATCH V9 00/15] monitor: support sub command group in auto completion and help Luiz Capitulino
2013-08-27  1:43   ` Wenchao Xia
2013-08-27 12:39     ` Wenchao Xia
2013-08-27 13:19       ` Luiz Capitulino
2013-08-28  2:16         ` 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=1377245887-22745-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).