diff options
| author | Markus Armbruster <armbru@redhat.com> | 2018-07-03 10:53:48 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2018-07-03 23:18:56 +0200 |
| commit | cee32796cadc9510ee00f029a933009df7a28ae2 (patch) | |
| tree | 1fb09ff3405d4ca4b75afc6304047f7376dd1ece /qapi | |
| parent | a193352ff9c7cd2cd07846118bc49921d0f53af8 (diff) | |
| download | qemu-cee32796cadc9510ee00f029a933009df7a28ae2.zip qemu-cee32796cadc9510ee00f029a933009df7a28ae2.tar.gz qemu-cee32796cadc9510ee00f029a933009df7a28ae2.tar.bz2 | |
qmp: De-duplicate error response building
All callers of qmp_build_error_object() duplicate the code to wrap it
in a response object. Replace it by qmp_error_response() that
captures the duplicated code, including error_free().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180703085358.13941-23-armbru@redhat.com>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/qmp-dispatch.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 6d78f3e..c85748a 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -141,11 +141,15 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QObject *request, return ret; } -QObject *qmp_build_error_object(Error *err) +QDict *qmp_error_response(Error *err) { - return qobject_from_jsonf("{ 'class': %s, 'desc': %s }", - QapiErrorClass_str(error_get_class(err)), - error_get_pretty(err)); + QDict *rsp; + + rsp = qdict_from_jsonf_nofail("{ 'error': { 'class': %s, 'desc': %s } }", + QapiErrorClass_str(error_get_class(err)), + error_get_pretty(err)); + error_free(err); + return rsp; } /* @@ -166,15 +170,13 @@ QObject *qmp_dispatch(QmpCommandList *cmds, QObject *request, ret = do_qmp_dispatch(cmds, request, allow_oob, &err); - rsp = qdict_new(); if (err) { - qdict_put_obj(rsp, "error", qmp_build_error_object(err)); - error_free(err); + rsp = qmp_error_response(err); } else if (ret) { + rsp = qdict_new(); qdict_put_obj(rsp, "return", ret); } else { - qobject_unref(rsp); - return NULL; + rsp = NULL; } return QOBJECT(rsp); |