aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-31 12:12:22 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-03-31 12:12:23 +0100
commit033a20359aaf93f4d8aa2be12558901e8e028baa (patch)
tree2227dbaf1d923cebde7994b35e8eec1611b32313
parent9e0ad3472dae5236052d455948396d8579bfc904 (diff)
parenta18bb417e954ceea0a30b46c38b0d58c3a7ca6a1 (diff)
downloadqemu-arm-033a20359aaf93f4d8aa2be12558901e8e028baa.tar.gz
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM infrastructure fixes and device conversions * Fix for adding alias properties with [*] # gpg: Signature made Tue Mar 31 11:59:00 2015 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber <afaerber@suse.de>" # gpg: aka "Andreas Färber <afaerber@suse.com>" * remotes/afaerber/tags/qom-devices-for-peter: qom: Fix object_property_add_alias() with [*] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qom/object.c2
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);