Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 31 Mar 2015 11:12:22 +0000 (12:12 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 31 Mar 2015 11:12:23 +0000 (12:12 +0100)
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>

Trivial merge