commit 4a29a85db9e67fcd07e6ca55d69e369e9874ec95
author Luiz Capitulino <lcapitulino@redhat.com> Thu Nov 26 22:59:05 2009 -0200
committer Anthony Liguori <aliguori@us.ibm.com> Thu Dec 03 09:41:24 2009 -0600
tree 3c60997fb70e0aa86a3bc20bd93616273d00caf5
parent b1a15e7eaafba8f26e2263b1a9b6e6d40e585e72

QMP: Disable monitor print functions

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>

monitor.c

diff --git a/monitor.c b/monitor.c
index cd2f19c..af6d3d5 100644
--- a/monitor.c
+++ b/monitor.c
@@ -98,6 +98,7 @@
 
 typedef struct MonitorControl {
     QObject *id;
+    int print_enabled;
     JSONMessageParser parser;
 } MonitorControl;
 
@@ -186,9 +187,13 @@
 
 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 @@
     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);
 }