diff options
author | Markus Armbruster <armbru@redhat.com> | 2017-03-03 13:32:29 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2017-03-05 09:14:19 +0100 |
commit | 99fb0c53c038105bae68b02a3d9f1cbf7951ba10 (patch) | |
tree | 1e2d57a8add050d85d22c31a670ffb29dff6b287 /qapi/qmp-dispatch.c | |
parent | 104fc3027960dd2aa9d310936a6cb201c60e1088 (diff) | |
download | qemu-99fb0c53c038105bae68b02a3d9f1cbf7951ba10.zip qemu-99fb0c53c038105bae68b02a3d9f1cbf7951ba10.tar.gz qemu-99fb0c53c038105bae68b02a3d9f1cbf7951ba10.tar.bz2 |
qmp: Eliminate silly QERR_QMP_* macros
The QERR_ macros are leftovers from the days of "rich" error objects.
QERR_QMP_BAD_INPUT_OBJECT, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
QERR_QMP_EXTRA_MEMBER are used in just one place now, except for one
use that has crept into qobject-input-visitor.c.
Drop these macros, to make the (bad) error messages more visible.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-10-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qapi/qmp-dispatch.c')
-rw-r--r-- | qapi/qmp-dispatch.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c index 7fb8aef..dc50212 100644 --- a/qapi/qmp-dispatch.c +++ b/qapi/qmp-dispatch.c @@ -30,7 +30,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) dict = qobject_to_qdict(request); if (!dict) { - error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "object"); + error_setg(errp, "Expected '%s' in QMP input", "object"); return NULL; } @@ -41,25 +41,26 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp) if (!strcmp(arg_name, "execute")) { if (qobject_type(arg_obj) != QTYPE_QSTRING) { - error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute", - "string"); + error_setg(errp, "QMP input object member '%s' expects '%s'", + "execute", "string"); return NULL; } has_exec_key = true; } else if (!strcmp(arg_name, "arguments")) { if (qobject_type(arg_obj) != QTYPE_QDICT) { - error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER, + error_setg(errp, "QMP input object member '%s' expects '%s'", "arguments", "object"); return NULL; } } else { - error_setg(errp, QERR_QMP_EXTRA_MEMBER, arg_name); + error_setg(errp, "QMP input object member '%s' is unexpected", + arg_name); return NULL; } } if (!has_exec_key) { - error_setg(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute"); + error_setg(errp, "Expected '%s' in QMP input", "execute"); return NULL; } |