From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDpBq-0001y0-8p for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:02 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDpBk-0001rj-4w for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:01 -0500 Received: from [199.232.76.173] (port=48304 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpBj-0001r7-Vl for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10644) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDpBj-0004Tf-8P for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:55 -0500 From: Luiz Capitulino Date: Thu, 26 Nov 2009 22:59:05 -0200 Message-Id: <1259283550-3597-16-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> References: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 15/20] QMP: Disable monitor print functions List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com, armbru@redhat.com 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 --- monitor.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 89115a6..a056503 100644 --- a/monitor.c +++ b/monitor.c @@ -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); } -- 1.6.6.rc0.50.gaf06e