OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Simplify how qmp_dispatch() deals with QCO_NO_SUCCESS_RESP

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20200317115459.31821-23-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-03-17 12:54:47 +01:00
parent cf4a0643c8
commit d322603563
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qapi/qmp-dispatch.c
View File

@ -106,7 +106,7 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,
QDict *dict = qobject_to(QDict, request); QDict *dict = qobject_to(QDict, request);
QObject *id = dict ? qdict_get(dict, "id") : NULL; QObject *id = dict ? qdict_get(dict, "id") : NULL;
QObject *ret = NULL; QObject *ret = NULL;
QDict *rsp; QDict *rsp = NULL;
dict = qmp_dispatch_check_obj(request, allow_oob, &err); dict = qmp_dispatch_check_obj(request, allow_oob, &err);
if (!dict) { if (!dict) {
@ -151,31 +151,32 @@ QDict *qmp_dispatch(QmpCommandList *cmds, QObject *request,
args = qdict_get_qdict(dict, "arguments"); args = qdict_get_qdict(dict, "arguments");
qobject_ref(args); qobject_ref(args);
} }
cmd->fn(args, &ret, &err); cmd->fn(args, &ret, &err);
qobject_unref(args);
if (err) { if (err) {
; goto out;
} else if (cmd->options & QCO_NO_SUCCESS_RESP) { }
if (cmd->options & QCO_NO_SUCCESS_RESP) {
g_assert(!ret); g_assert(!ret);
return NULL;
} else if (!ret) { } else if (!ret) {
/* TODO turn into assertion */ /* TODO turn into assertion */
ret = QOBJECT(qdict_new()); ret = QOBJECT(qdict_new());
} }
qobject_unref(args); rsp = qdict_new();
qdict_put_obj(rsp, "return", ret);
out: out:
if (err) { if (err) {
assert(!rsp);
rsp = qmp_error_response(err); rsp = qmp_error_response(err);
} else if (ret) {
rsp = qdict_new();
qdict_put_obj(rsp, "return", ret);
} else {
/* Can only happen for commands with QCO_NO_SUCCESS_RESP */
rsp = NULL;
} }
if (rsp && id) { assert(rsp);
if (id) {
qdict_put_obj(rsp, "id", qobject_ref(id)); qdict_put_obj(rsp, "id", qobject_ref(id));
} }