From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDpBa-0001jA-4x for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:46 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDpBV-0001fI-Np for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:45 -0500 Received: from [199.232.76.173] (port=48296 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpBV-0001fC-HT for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48004) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDpBU-0004Ql-Ui for qemu-devel@nongnu.org; Thu, 26 Nov 2009 19:59:41 -0500 From: Luiz Capitulino Date: Thu, 26 Nov 2009 22:58:59 -0200 Message-Id: <1259283550-3597-10-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 09/20] QMP: Output support 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 In the new Monitor output is always performed by only two functions: do_info() and monitor_call_handler(). To support QMP output, we modify those functions to check if we are in control mode. If so, we call monitor_protocol_emitter() to emit QMP output, otherwise we do regular output. QMP has two types of responses to issued commands: success and error. The outputed data is always a JSON object. Success responses have the following format: { "return": json-value, "id": json-value } Error responses have the following format: { "error": { "class": json-string, "desc": json-string, "data": json-value } "id": json-value } Please, note that the "id" key is part of the input code, and thus is not added in this commit. Signed-off-by: Luiz Capitulino --- monitor.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index c333b7a..ffb5ed2 100644 --- a/monitor.c +++ b/monitor.c @@ -267,6 +267,32 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data) QDECREF(json); } +static void monitor_protocol_emitter(Monitor *mon, QObject *data) +{ + QDict *qmp; + + qmp = qdict_new(); + + if (!monitor_has_error(mon)) { + /* success response */ + if (data) { + qobject_incref(data); + qdict_put_obj(qmp, "return", data); + } else { + qdict_put(qmp, "return", qstring_from_str("OK")); + } + } else { + /* error response */ + qdict_put(qmp, "error", mon->error->error); + QINCREF(mon->error->error); + QDECREF(mon->error); + mon->error = NULL; + } + + monitor_json_emitter(mon, QOBJECT(qmp)); + QDECREF(qmp); +} + static int compare_cmd(const char *name, const char *list) { const char *p, *pstart; @@ -354,8 +380,15 @@ static void do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) if (monitor_handler_ported(cmd)) { cmd->mhandler.info_new(mon, ret_data); - if (*ret_data) - cmd->user_print(mon, *ret_data); + + if (!monitor_ctrl_mode(mon)) { + /* + * User Protocol function is called here, Monitor Protocol is + * handled by monitor_call_handler() + */ + if (*ret_data) + cmd->user_print(mon, *ret_data); + } } else { cmd->mhandler.info(mon); } @@ -3335,8 +3368,15 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd, QObject *data = NULL; cmd->mhandler.cmd_new(mon, params, &data); - if (data) - cmd->user_print(mon, data); + + if (monitor_ctrl_mode(mon)) { + /* Monitor Protocol */ + monitor_protocol_emitter(mon, data); + } else { + /* User Protocol */ + if (data) + cmd->user_print(mon, data); + } qobject_decref(data); } -- 1.6.6.rc0.50.gaf06e