From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsVY8-0002Tw-Vx for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:09:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsVY2-0004Qk-35 for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:09:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsVY1-0004QJ-QH for qemu-devel@nongnu.org; Thu, 05 Jun 2014 07:09:30 -0400 Message-ID: <53904FE3.4040306@redhat.com> Date: Thu, 05 Jun 2014 13:09:23 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <20140604175200.667995104@amt.cnet> <20140604175446.484888751@amt.cnet> In-Reply-To: <20140604175446.484888751@amt.cnet> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [patch 2/3] add object_property_add_alias List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mtosatti@redhat.com, qemu-devel@nongnu.org Cc: gleb@kernel.org, mprivozn@redhat.com, armbru@redhat.com Il 04/06/2014 19:52, mtosatti@redhat.com ha scritto: > Allowing addition of a link without keeping pointer-to-pointer. > > Signed-off-by: Marcelo Tosatti > > --- > include/qom/object.h | 13 +++++++++ > qom/object.c | 73 +++++++++++++++++++++++++++++++++++++++++---------- > 2 files changed, 72 insertions(+), 14 deletions(-) > > Index: qemu/include/qom/object.h > =================================================================== > --- qemu.orig/include/qom/object.h 2014-06-02 23:12:51.875693325 -0300 > +++ qemu/include/qom/object.h 2014-06-02 23:14:13.045432426 -0300 > @@ -1073,6 +1073,19 @@ > } ObjectPropertyLinkFlags; > > /** > + * object_property_add_alias: > + * @obj: the object to add a property to > + * @name: the name of the property > + * @alias: the alias object > + * @errp: if an error occurs, a pointer to an area to store the area > + * > + * Add a link under obj, named name, pointing to alias. > + * > + */ > +void object_property_add_alias(Object *obj, const char *name, > + Object *alias, Error **errp); > + > +/** > * object_property_allow_set_link: > * > * The default implementation of the object_property_add_link() check() > Index: qemu/qom/object.c > =================================================================== > --- qemu.orig/qom/object.c 2014-06-02 23:12:51.875693325 -0300 > +++ qemu/qom/object.c 2014-06-02 23:14:13.046432423 -0300 > @@ -1023,27 +1023,71 @@ > g_free(type); > } > > +typedef struct { > + Object *child; > + Object **childp; These field names are ugly... not your fault, but perhaps Object **linkp; Object *alias_dest; would be better. It would also avoid the mistake below: > @@ -1096,7 +1140,7 @@ > { > Error *local_err = NULL; > LinkProperty *prop = opaque; > - Object **child = prop->child; > + Object **child = prop->childp; > Object *old_target = *child; > Object *new_target = NULL; > char *path = NULL; This is object_set_link_property. It writes *child but not prop->child, and subsequent calls to object_get_link_property incorrect. However, since a similar need arose recently in one of Peter Crosthwaite's patches, let's add a generic resolve mechanism. I'll post a short series in a second, as soon as I finish testing it. Paolo > @@ -1133,8 +1177,8 @@ > { > LinkProperty *prop = opaque; > > - if ((prop->flags & OBJ_PROP_LINK_UNREF_ON_RELEASE) && *prop->child) { > - object_unref(*prop->child); > + if ((prop->flags & OBJ_PROP_LINK_UNREF_ON_RELEASE) && prop->child) { > + object_unref(prop->child); > } > g_free(prop); > } > @@ -1150,7 +1194,8 @@ > LinkProperty *prop = g_malloc(sizeof(*prop)); > gchar *full_type; > > - prop->child = child; > + prop->childp = child; > + prop->child = *child; > prop->check = check; > prop->flags = flags; > > @@ -1227,7 +1272,7 @@ > > if (object_property_is_link(prop)) { > LinkProperty *lprop = prop->opaque; > - return *lprop->child; > + return lprop->child; > } else if (object_property_is_child(prop)) { > return prop->opaque; > } else { > >