Re: [Qemu-devel] [PATCH v4 10/28] qmp: Improve QMP dispatch error messages

[Philippe Mathieu-Daudé]

On 03/07/2017 11:21 AM, Eric Blake wrote:
> On 03/05/2017 02:01 AM, Markus Armbruster wrote:
>
> > Since substantial other work depends on this series, it needs to go in
> > sooner rather than later.  I'm therefore *dropping* this patch from the
> > series.  We can then bikeshed^Wpolish to our heart's content without
> > holding up other work.
> >
> > That said: what about this?
> >
> > diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
> > index dc50212..5ad36f8 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,26 +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, "QMP input object member '%s' expects '%s'",
> > -                           "execute", "string");
> > +                error_setg(errp,
> > +                           "QMP input member 'execute' must be a string");
> >                  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 member 'arguments' must be an object");
> >                  return NULL;
> >              }
> >          } else {
> > -            error_setg(errp, "QMP input object member '%s' is unexpected",
> > +            error_setg(errp, "QMP input member '%s' is unexpected",
> >                         arg_name);
> >              return NULL;
> >          }
> >      }
> >
> >      if (!has_exec_key) {
> > -        error_setg(errp, "Expected '%s' in QMP input", "execute");
> > +        error_setg(errp, "QMP input lacks member 'execute'");
> >          return NULL;
> >      }
>
> Based on the rest of this sub-thread, I'm making it explicit that you
> can add:
> Reviewed-by: Eric Blake <address@hidden>

this is not a blocking issue, this code is OK, no need to drop!

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>