Re: [Qemu-devel] [STABLE 0.12] QMP: Drop wrong assert()

[Luiz Capitulino]

On Tue, 22 Dec 2009 08:50:30 +0100
Markus Armbruster <address@hidden> wrote:

> Luiz Capitulino <address@hidden> writes:
> 
> > Some commands return a QList of QDicts, which is valid,
> > but will trig the assert().
> >
> > Just drop it.
> >
> > Reported-by: Nathan Baum <address@hidden>
> > Signed-off-by: Luiz Capitulino <address@hidden>
> > ---
> >  monitor.c |    1 -
> >  1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/monitor.c b/monitor.c
> > index c0dc48e..3af1d5c 100644
> > --- a/monitor.c
> > +++ b/monitor.c
> > @@ -283,7 +283,6 @@ static void monitor_protocol_emitter(Monitor *mon, 
> > QObject *data)
> >      if (!monitor_has_error(mon)) {
> >          /* success response */
> >          if (data) {
> > -            assert(qobject_type(data) == QTYPE_QDICT);
> >              qobject_incref(data);
> >              qdict_put_obj(qmp, "return", data);
> >          } else {
> 
> Yes, let's drop the assertion for now.
> 
> qmp-spec.txt specifies "json-object", so it needs fixing as well.
> I figure what we want is either a dictionary (json-object), or a list of
> dictionaries (json-array of json-object).

 Right, fixed in my tree. I've introduced the 'or' keyword.