[Qemu-devel] [PATCH v3 24/38] qmp: remove qmp_build_error_object()

[Marc-André Lureau]

Now that we have a single caller, we may as well fold the function.

Signed-off-by: Marc-André Lureau <address@hidden>
---
 include/qapi/qmp/dispatch.h |  1 -
 qapi/qmp-dispatch.c         | 12 ++++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/include/qapi/qmp/dispatch.h b/include/qapi/qmp/dispatch.h
index 7ca8ab17d9..c5ac3bd41e 100644
--- a/include/qapi/qmp/dispatch.h
+++ b/include/qapi/qmp/dispatch.h
@@ -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);
 
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 7b57fa7987..c6089de616 100644
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -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
-- 
2.17.0.rc1.1.g4c4f2b46a3