diff options
| author | Andreas Färber | 2015-03-27 17:34:10 +0100 |
|---|---|---|
| committer | Andreas Färber | 2015-03-31 12:56:48 +0200 |
| commit | a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1 (patch) | |
| tree | 6e973b0afc227e7c2da6ef65f3ddca5b6373bc17 /qom | |
| parent | Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150330'... (diff) | |
| download | qemu-a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1.tar.gz qemu-a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1.tar.xz qemu-a18bb417e954ceea0a30b46c38b0d58c3a7ca6a1.zip | |
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().
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>
Diffstat (limited to 'qom')
| -rw-r--r-- | qom/object.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |