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 V6 02/13] monitor: avoid use of global *cur_mon in file_completion()
Date: Thu, 11 Jul 2013 11:13:38 +0800 [thread overview]
Message-ID: <1373512429-17865-3-git-send-email-xiawenc@linux.vnet.ibm.com> (raw)
In-Reply-To: <1373512429-17865-1-git-send-email-xiawenc@linux.vnet.ibm.com>
Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
---
monitor.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 7398d00..181d5b0 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4022,7 +4022,7 @@ static void cmd_completion(Monitor *mon, const char *name, const char *list)
}
}
-static void file_completion(const char *input)
+static void file_completion(Monitor *mon, const char *input)
{
DIR *ffs;
struct dirent *d;
@@ -4045,7 +4045,7 @@ static void file_completion(const char *input)
pstrcpy(file_prefix, sizeof(file_prefix), p + 1);
}
#ifdef DEBUG_COMPLETION
- monitor_printf(cur_mon, "input='%s' path='%s' prefix='%s'\n",
+ monitor_printf(mon, "input='%s' path='%s' prefix='%s'\n",
input, path, file_prefix);
#endif
ffs = opendir(path);
@@ -4072,7 +4072,7 @@ static void file_completion(const char *input)
if (stat(file, &sb) == 0 && S_ISDIR(sb.st_mode)) {
pstrcat(file, sizeof(file), "/");
}
- readline_add_completion(cur_mon->rs, file);
+ readline_add_completion(mon->rs, file);
}
}
closedir(ffs);
@@ -4183,7 +4183,7 @@ static void monitor_find_completion(const char *cmdline)
case 'F':
/* file completion */
readline_set_completion_index(cur_mon->rs, strlen(str));
- file_completion(str);
+ file_completion(mon, str);
break;
case 'B':
/* block device name completion */
--
1.7.1
next prev parent reply other threads:[~2013-07-11 3:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-11 3:13 [Qemu-devel] [PATCH V6 00/13] monitor: support sub command group in auto completion and help Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 01/13] monitor: avoid use of global *cur_mon in cmd_completion() Wenchao Xia
2013-07-11 3:13 ` Wenchao Xia [this message]
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 03/13] monitor: avoid use of global *cur_mon in block_completion_it() Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 04/13] monitor: avoid use of global *cur_mon in monitor_find_completion() Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 05/13] monitor: avoid use of global *cur_mon in readline_completion() Wenchao Xia
2013-07-17 19:34 ` Luiz Capitulino
2013-07-18 1:55 ` Wenchao Xia
2013-07-18 15:02 ` Luiz Capitulino
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 06/13] monitor: avoid direct use of global variable *mon_cmds Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 07/13] monitor: code move for parse_cmdline() Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 08/13] monitor: refine parse_cmdline() Wenchao Xia
2013-07-17 19:39 ` Luiz Capitulino
2013-07-18 2:01 ` Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 09/13] monitor: support sub command in help Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 10/13] monitor: refine monitor_find_completion() Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 11/13] monitor: support sub command in auto completion Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 12/13] monitor: allow "help" show message for single command in sub group Wenchao Xia
2013-07-11 3:13 ` [Qemu-devel] [PATCH V6 13/13] monitor: improve auto complete of "help" " 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=1373512429-17865-3-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).