From 15b820e72b135f18b298d2675295f3f8f8a778e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 12 Feb 2018 16:33:13 -0500 Subject: [PATCH] qom: Fix object_property_add_alias() with [*] 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(). Backports commit a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1 from qemu --- qemu/qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/qom/object.c b/qemu/qom/object.c index 0e3db373..6db01ec4 100644 --- a/qemu/qom/object.c +++ b/qemu/qom/object.c @@ -1615,7 +1615,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);