From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ycu0g-0002T2-Vw for qemu-devel@nongnu.org; Tue, 31 Mar 2015 07:07:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ycu0c-00042L-2E for qemu-devel@nongnu.org; Tue, 31 Mar 2015 07:07:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 31 Mar 2015 13:06:56 +0200 Message-Id: <1427800016-3280-2-git-send-email-afaerber@suse.de> In-Reply-To: <1427800016-3280-1-git-send-email-afaerber@suse.de> References: <1427800016-3280-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/1] qom: Fix object_property_add_alias() with [*] List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "v2.2+" , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" 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=C3=A4rber --- qom/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qom/object.c b/qom/object.c index d167038..b8dff43 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1761,7 +1761,7 @@ void object_property_add_alias(Object *obj, const c= har *name, } op->resolve =3D property_resolve_alias; =20 - object_property_set_description(obj, name, + object_property_set_description(obj, op->name, target_prop->description, &error_abort); =20 --=20 2.1.4