@@ -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);
}
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 <lcapitulino@redhat.com> --- monitor.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-)