Re: [Qemu-devel] [PATCH v2 1/3] qmp: fix object-add assert() without props

[Eric Blake]

On 09/22/2016 08:09 AM, Marc-André Lureau wrote:
> Since commit ad739706bbadee49, user_creatable_add_type() expects to be
> given a qdict. However, if object-add is called without props, you reach
> the assert: "qemu/qom/object_interfaces.c:115: user_creatable_add_type:
> Assertion `qdict' failed.", because the qdict isn't created in this
> case (it's optional).
> 
> Furthermore, qmp_input_visitor_new() is not meant to be called without a
> dict, and a further commit will assert in this situation.
> 
> If none given, create an empty qdict in qmp to avoid the
> user_creatable_add_type() assert(qdict).
> 
> Signed-off-by: Marc-André Lureau 
> ---
>  qmp.c | 8 ++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 

Looks nicer than v1. Thanks.

Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-devel] [PATCH v2 1/3] qmp: fix object-add assert() without props

[Marc-André Lureau]

Since commit ad739706bbadee49, user_creatable_add_type() expects to be
given a qdict. However, if object-add is called without props, you reach
the assert: "qemu/qom/object_interfaces.c:115: user_creatable_add_type:
Assertion `qdict' failed.", because the qdict isn't created in this
case (it's optional).

Furthermore, qmp_input_visitor_new() is not meant to be called without a
dict, and a further commit will assert in this situation.

If none given, create an empty qdict in qmp to avoid the
user_creatable_add_type() assert(qdict).

Signed-off-by: Marc-André Lureau 
---
 qmp.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/qmp.c b/qmp.c
index 6733463..b6de482 100644
--- a/qmp.c
+++ b/qmp.c
@@ -665,7 +665,7 @@ void qmp_add_client(const char *protocol, const char 
*fdname,
 void qmp_object_add(const char *type, const char *id,
 bool has_props, QObject *props, Error **errp)
 {
-const QDict *pdict = NULL;
+QDict *pdict;
 Visitor *v;
 Object *obj;
 
@@ -675,14 +675,18 @@ void qmp_object_add(const char *type, const char *id,
 error_setg(errp, QERR_INVALID_PARAMETER_TYPE, "props", "dict");
 return;
 }
+QINCREF(pdict);
+} else {
+pdict = qdict_new();
 }
 
-v = qmp_input_visitor_new(props, true);
+v = qmp_input_visitor_new(QOBJECT(pdict), true);
 obj = user_creatable_add_type(type, id, pdict, v, errp);
 visit_free(v);
 if (obj) {
 object_unref(obj);
 }
+QDECREF(pdict);
 }
 
 void qmp_object_del(const char *id, Error **errp)
-- 
2.10.0