From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzmHH-0003qJ-4c for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzmHB-0001FM-6r for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6299) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzmHA-0001FG-Ug for qemu-devel@nongnu.org; Wed, 25 Jun 2014 08:26:09 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5PCQ8SD002329 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 25 Jun 2014 08:26:08 -0400 Received: from playground.com (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5PCQ06U026682 for ; Wed, 25 Jun 2014 08:26:07 -0400 From: Paolo Bonzini Date: Wed, 25 Jun 2014 14:25:47 +0200 Message-Id: <1403699158-4344-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1403699158-4344-1-git-send-email-pbonzini@redhat.com> References: <1403699158-4344-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for 2.1 03/14] qom: allow creating an alias of a child<> property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Child properties must be unique. Fix this problem by turning their aliases into links. The resolve function that forwards to the target property does not have any knowledge of the target property's type, so it works fine. Reviewed-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- qom/object.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index 1c97022..4d1c999 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1607,22 +1607,32 @@ void object_property_add_alias(Object *obj, const char *name, AliasProperty *prop; ObjectProperty *op; ObjectProperty *target_prop; + gchar *prop_type; target_prop = object_property_find(target_obj, target_name, errp); if (!target_prop) { return; } + if (object_property_is_child(target_prop)) { + prop_type = g_strdup_printf("link%s", + target_prop->type + strlen("child")); + } else { + prop_type = g_strdup(target_prop->type); + } + prop = g_malloc(sizeof(*prop)); prop->target_obj = target_obj; prop->target_name = target_name; - op = object_property_add(obj, name, target_prop->type, + op = object_property_add(obj, name, prop_type, property_get_alias, property_set_alias, property_release_alias, alias, errp); op->resolve = property_resolve_alias; + + g_free(prop_type); } static void object_instance_init(Object *obj) -- 1.8.3.1