mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QMP: Output support

Browse Source 
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>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-11-26 22:58:59 -02:00 committed by Anthony Liguori
parent 9b57c02e3e
commit 25b422eb40
1 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
monitor.c
View File

@ -267,6 +267,32 @@ static void monitor_json_emitter(Monitor *mon, const QObject *data)
QDECREF(json); 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) static int compare_cmd(const char *name, const char *list)
{ {
const char *p, *pstart; 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)) { if (monitor_handler_ported(cmd)) {
cmd->mhandler.info_new(mon, ret_data); 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 { } else {
cmd->mhandler.info(mon); cmd->mhandler.info(mon);
} }
@ -3250,8 +3283,15 @@ static void monitor_call_handler(Monitor *mon, const mon_cmd_t *cmd,
QObject *data = NULL; QObject *data = NULL;
cmd->mhandler.cmd_new(mon, params, &data); 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); qobject_decref(data);
} }