From a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 27 Mar 2015 17:34:10 +0100 Subject: [PATCH] qom: Fix object_property_add_alias() with [*] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 8074264 (qom: Add description field in ObjectProperty struct) introduced property descriptions and copied them for alias properties. Instead of using the caller-supplied property name, use the returned property name for setting the description. This avoids an Error when setting a property description for a property with literal "[*]" that doesn't exist due to automatic property naming in object_property_add(). Reviewed-by: Gonglei Acked-by: Paolo Bonzini Cc: Michael S. Tsirkin Cc: qemu-stable@nongnu.org (v2.2+) Signed-off-by: Andreas Färber --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index d1670387b4..b8dff43297 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1761,7 +1761,7 @@ void object_property_add_alias(Object *obj, const char *name, } op->resolve = property_resolve_alias; - object_property_set_description(obj, name, + object_property_set_description(obj, op->name, target_prop->description, &error_abort);