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

Monitor: Drop the print disabling mechanism 

We can ignore calls to monitor_vprintf() in QMP mode and use
monitor_puts() directly in monitor_json_emitter().

This allows us to drop this ugly hack.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2010-02-10 23:50:04 -02:00 committed by Anthony Liguori
parent b4475aa2b3
commit b8b08266bd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monitor.c
View File

@ -120,7 +120,6 @@ struct mon_fd_t {
typedef struct MonitorControl {
QObject *id;
int print_enabled;
JSONMessageParser parser;
int command_mode;
} MonitorControl;
@ -226,16 +225,18 @@ static void monitor_puts(Monitor *mon, const char *str)
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
{
char buf[4096];
if (!mon)
return;
if (mon->mc && !mon->mc->print_enabled) {
if (monitor_ctrl_mode(mon)) {
qemu_error_new(QERR_UNDEFINED_ERROR);
} else {
char buf[4096];
vsnprintf(buf, sizeof(buf), fmt, ap);
monitor_puts(mon, buf);
return;
}
vsnprintf(buf, sizeof(buf), fmt, ap);
monitor_puts(mon, buf);
}
void monitor_printf(Monitor *mon, const char *fmt, ...)
@ -306,9 +307,8 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data)
json = qobject_to_json(data);
assert(json != NULL);
mon->mc->print_enabled = 1;
monitor_printf(mon, "%s\n", qstring_get_str(json));
mon->mc->print_enabled = 0;
qstring_append_chr(json, '\n');
monitor_puts(mon, qstring_get_str(json));
QDECREF(json);
}