Commit 033a2035 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9e0ad347 a18bb417

qom/object.c

+1 −1
Original line number Diff line number Diff line
@@ -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);