OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hmp: human-monitor-command: stop using the Memory chardev driver

Browse Source 
The Memory chardev driver was added because, as the Monitor's output
buffer was static, we needed a way to accumulate the output of an
HMP commmand when ran by human-monitor-command.

However, the Monitor's output buffer is now dynamic, so it's possible
for the human-monitor-command to use it instead of the Memory chardev
driver.

This commit does that change, but there are two important
observations about it:

 1. We need a way to signal to the Monitor that it shouldn't call
    chardev functions when flushing its output. This is done
    by adding a new flag to the Monitor object called skip_flush
	(which is set to true by qmp_human_monitor_command())

 2. The current code has buffered semantics: QMP clients will
    only see a command's output if it flushes its output with
	a new-line character. This commit changes this to unbuffered,
	which means that QMP clients will see a command's output
	whenever the command prints anything.

	I don't think this will matter in practice though, as I believe
	all HMP commands print the new-line character anyway.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Luiz Capitulino 2013-04-02 15:07:33 -04:00
parent e1f2641b59
commit 48c043d0d1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
monitor.c
View File

@ -188,6 +188,7 @@ struct Monitor {
int reset_seen; int reset_seen;
int flags; int flags;
int suspend_cnt; int suspend_cnt;
bool skip_flush;
QString *outbuf; QString *outbuf;
ReadLineState *rs; ReadLineState *rs;
MonitorControl *mc; MonitorControl *mc;
@ -273,6 +274,10 @@ void monitor_flush(Monitor *mon)
size_t len; size_t len;
const char *buf; const char *buf;
if (mon->skip_flush) {
return;
}
buf = qstring_get_str(mon->outbuf); buf = qstring_get_str(mon->outbuf);
len = qstring_get_length(mon->outbuf); len = qstring_get_length(mon->outbuf);
@ -675,13 +680,10 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
{ {
char *output = NULL; char *output = NULL;
Monitor *old_mon, hmp; Monitor *old_mon, hmp;
CharDriverState mchar;
memset(&hmp, 0, sizeof(hmp)); memset(&hmp, 0, sizeof(hmp));
hmp.outbuf = qstring_new(); hmp.outbuf = qstring_new();
hmp.skip_flush = true;
qemu_chr_init_mem(&mchar);
hmp.chr = &mchar;
old_mon = cur_mon; old_mon = cur_mon;
cur_mon = &hmp; cur_mon = &hmp;
@ -699,17 +701,14 @@ char *qmp_human_monitor_command(const char *command_line, bool has_cpu_index,
handle_user_command(&hmp, command_line); handle_user_command(&hmp, command_line);
cur_mon = old_mon; cur_mon = old_mon;
if (qemu_chr_mem_osize(hmp.chr) > 0) { if (qstring_get_length(hmp.outbuf) > 0) {
QString *str = qemu_chr_mem_to_qs(hmp.chr); output = g_strdup(qstring_get_str(hmp.outbuf));
output = g_strdup(qstring_get_str(str));
QDECREF(str);
} else { } else {
output = g_strdup(""); output = g_strdup("");
} }
out: out:
QDECREF(hmp.outbuf); QDECREF(hmp.outbuf);
qemu_chr_close_mem(hmp.chr);
return output; return output;
} }