Message ID | 1345801763-24227-2-git-send-email-qemulist@gmail.com |
---|---|
State | New |
Headers | show |
Il 24/08/2012 11:49, Liu Ping Fan ha scritto: > From: Liu Ping Fan <pingfank@linux.vnet.ibm.com> > > Currently, link property's target is only managed by > object_set_link_property(). This will raise such issue that when > the property is finalized, its target has no opportunity to release. > > Fix this issue by introduce object_finalize_link_property() > In correspond, ref target when adding link prpoerty. > > Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com> > --- This patch is fine, but it is at the wrong place in the series. It will cause an assertion failure due to the unbroken circular reference. Paolo
diff --git a/qom/object.c b/qom/object.c index a552be2..00f98d7 100644 --- a/qom/object.c +++ b/qom/object.c @@ -957,6 +957,16 @@ static void object_set_link_property(Object *obj, Visitor *v, void *opaque, } } +static void object_finalize_link_property(Object *obj, const char *name, + void *opaque) +{ + Object **child = opaque; + + if (*child != NULL) { + object_unref(*child); + } +} + void object_property_add_link(Object *obj, const char *name, const char *type, Object **child, Error **errp) @@ -968,8 +978,10 @@ void object_property_add_link(Object *obj, const char *name, object_property_add(obj, name, full_type, object_get_link_property, object_set_link_property, - NULL, child, errp); - + object_finalize_link_property, child, errp); + if (*child != NULL) { + object_ref(*child); + } g_free(full_type); }