Hi Markus,
On 03/03/2017 09:32 AM, Markus Armbruster wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> qapi/qmp-dispatch.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
> index 23b0528..578c6d8 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, "Expected '%s' in QMP input", "object");
> + error_setg(errp, "QMP input must be a JSON object");
> return NULL;
> }
>
> @@ -41,15 +41,17 @@ 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, "QMP input object member '%s' expects '%s'",
> - "execute", "string");
> + error_setg(errp,
> + "QMP input object member '%s' must be %s",
> + "execute", "a string");
let's avoid formatting like the rest of this patch.
> return NULL;
> }
> has_exec_key = true;
> } else if (!strcmp(arg_name, "arguments")) {
> if (qobject_type(arg_obj) != QTYPE_QDICT) {
> - error_setg(errp, "QMP input object member '%s' expects '%s'",
> - "arguments", "object");
> + error_setg(errp,
> + "QMP input object member '%s' must be %s",
> + "arguments", "an object");
same.
> return NULL;
> }
> } else {
> @@ -60,7 +62,7 @@ static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)
> }
>
> if (!has_exec_key) {
> - error_setg(errp, "Expected '%s' in QMP input", "execute");
> + error_setg(errp, "QMP input object lacks key 'execute'");
> return NULL;
> }
>
>