[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/20] QMP: Output support
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 09/20] QMP: Output support |
Date: |
Thu, 26 Nov 2009 22:58:59 -0200 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v1 00/20] QEMU Monitor Protocol, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 01/20] monitor: Introduce MONITOR_USE_CONTROL flag, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 02/20] monitor: Command-line flag to enable control mode, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 03/20] monitor: Introduce monitor_call_handler(), Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 04/20] monitor: Introduce monitor_find_command(), Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 05/20] monitor: Rename monitor_handle_command(), Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 06/20] monitor: Introduce 'info commands', Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 07/20] QError: Add errors needed by QMP, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 08/20] QMP: Initial support, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 09/20] QMP: Output support,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 10/20] QMP: do_info() checks, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 11/20] QMP: Input support, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 12/20] QMP: Allow 'query-' commands, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 13/20] QMP: Asynchronous events infrastructure, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 14/20] QMP: Introduce basic asynchronous events, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 15/20] QMP: Disable monitor print functions, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 16/20] QMP: Introduce README file, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 17/20] QMP: Introduce specification, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 18/20] QMP: Introduce qmp-events.txt, Luiz Capitulino, 2009/11/26
- [Qemu-devel] [PATCH 19/20] QMP: Introduce qmp-shell, Luiz Capitulino, 2009/11/26