[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/15] QMP: Output support
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/15] QMP: Output support |
Date: |
Thu, 19 Nov 2009 13:13:34 -0200 |
In the new Monitor, output is always done by only two
functions: do_info() and monitor_call_handler().
To support QMP output, we modify those functions to test 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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/monitor.c b/monitor.c
index be68dd5..e81f9e6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -273,6 +273,33 @@ 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 {
+ // FIXME: should we return json-null here?
+ qdict_put(qmp, "return", qstring_from_str("OK"));
+ }
+ } else {
+ /* error response */
+ QINCREF(mon->error->error);
+ qdict_put(qmp, "error", 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;
@@ -360,8 +387,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_handle_command()
+ */
+ if (*ret_data)
+ cmd->user_print(mon, *ret_data);
+ }
} else {
cmd->mhandler.info(mon);
}
@@ -3292,8 +3326,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);
}
@@ -3315,10 +3356,11 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
monitor_call_handler(mon, cmd, qdict);
} else {
cmd->mhandler.cmd(mon, qdict);
- }
- if (monitor_has_error(mon))
- monitor_print_error(mon);
+ if (monitor_has_error(mon)) {
+ monitor_print_error(mon);
+ }
+ }
qemu_errors_to_previous();
--
1.6.5.3.148.g785c5
- [Qemu-devel] [RFC v0 00/15] QEMU Monitor Protocol, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 01/15] monitor: Introduce MONITOR_USE_CONTROL flag, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 02/15] monitor: Command-line flag to enable control mode, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 03/15] monitor: Move handler calling code to its own function, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 04/15] QError: Add errors used by QMP, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 05/15] QMP: chardev handling, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 06/15] QMP: Output support,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 07/15] QMP: Input support, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 08/15] QMP: Asynchronous events infrastructure, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 09/15] QMP: Introduce basic asynchronous events, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 10/15] QMP: Disable monitor print functions, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 11/15] QMP: Introduce README file, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 12/15] QMP: Introduce specification, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 13/15] QMP: Introduce qmp-events.txt, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 14/15] QMP: Introduce qmp-shell, Luiz Capitulino, 2009/11/19
- [Qemu-devel] [PATCH 15/15] QMP: Introduce vm-info, Luiz Capitulino, 2009/11/19
- [Qemu-devel] Re: [RFC v0 00/15] QEMU Monitor Protocol, Avi Kivity, 2009/11/19