qom: Fix object_property_add_alias() with [*]
authorAndreas Färber <afaerber@suse.de>
Fri, 27 Mar 2015 16:34:10 +0000 (17:34 +0100)
committerAndreas Färber <afaerber@suse.de>
Tue, 31 Mar 2015 10:56:48 +0000 (12:56 +0200)
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 <arei.gonglei@huawei.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: qemu-stable@nongnu.org (v2.2+)
Signed-off-by: Andreas Färber <afaerber@suse.de>
qom/object.c

index d167038..b8dff43 100644 (file)
@@ -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);