@@ -105,7 +105,6 @@ void qmp_enable_command(QmpCommandList *cmds, const char *name);
bool qmp_command_is_enabled(const QmpCommand *cmd);
const char *qmp_command_name(const QmpCommand *cmd);
bool qmp_has_success_response(const QmpCommand *cmd);
-QObject *qmp_build_error_object(Error *err);
QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp);
bool qmp_is_oob(const QDict *dict);
@@ -49,7 +49,10 @@ void qmp_return(QmpReturn *qret, QObject *rsp)
void qmp_return_error(QmpReturn *qret, Error *err)
{
- qdict_put_obj(qret->rsp, "error", qmp_build_error_object(err));
+ qdict_put_obj(qret->rsp, "error",
+ qobject_from_jsonf("{ 'class': %s, 'desc': %s }",
+ QapiErrorClass_str(error_get_class(err)),
+ error_get_pretty(err)));
error_free(err);
qret->session->return_cb(qret->session, qret->rsp);
qmp_return_free(qret);
@@ -153,13 +156,6 @@ static QObject *do_qmp_dispatch(QmpCommandList *cmds, QDict *dict,
return ret;
}
-QObject *qmp_build_error_object(Error *err)
-{
- return qobject_from_jsonf("{ 'class': %s, 'desc': %s }",
- QapiErrorClass_str(error_get_class(err)),
- error_get_pretty(err));
-}
-
/*
* Detect whether a request should be run out-of-band, by quickly
* peeking at whether we have: { "control": { "run-oob": true } }. By
Now that we have a single caller, we may as well fold the function. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- include/qapi/qmp/dispatch.h | 1 - qapi/qmp-dispatch.c | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-)