mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 14:24:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

QMP: Disable monitor print functions

Browse Source 
We still have handlers which will call monitor print functions
in several places. Usually to report errors.

If they do this when we are in control mode, we will be emitting
garbage to our clients.

To avoid this problem, this commit adds a way to disable those
functions. If any of them is called when in control mode, we will
emit a generic error.

Although this is far from the perfect solution, it guarantees
that only JSON is sent to Clients.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-11-26 22:59:05 -02:00 committed by Anthony Liguori
parent b1a15e7eaa
commit 4a29a85db9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monitor.c
View File

@ -98,6 +98,7 @@ struct mon_fd_t {
typedef struct MonitorControl {
QObject *id;
int print_enabled;
JSONMessageParser parser;
} MonitorControl;
@ -186,9 +187,13 @@ static void monitor_puts(Monitor *mon, const char *str)
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
{
char buf[4096];
vsnprintf(buf, sizeof(buf), fmt, ap);
monitor_puts(mon, buf);
if (mon->mc && !mon->mc->print_enabled) {
qemu_error_new(QERR_UNDEFINED_ERROR);
} else {
char buf[4096];
vsnprintf(buf, sizeof(buf), fmt, ap);
monitor_puts(mon, buf);
}
}
void monitor_printf(Monitor *mon, const char *fmt, ...)
@ -272,7 +277,10 @@ 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;
QDECREF(json);
}