From: Peter Maydell Date: Thu, 4 Sep 2014 18:41:15 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fd884c07658d02a96a882b8457d6d7a5cd71a407;p=qemu.git Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging QOM infrastructure fixes and device conversions * Cleanups for recursive device unrealization # gpg: Signature made Thu 04 Sep 2014 18:17:35 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/qom-devices-for-peter: qdev: Add cleanup logic in device_set_realized() to avoid resource leak qdev: Use NULL instead of local_err for qbus_child unrealize qdev: Use error_abort instead of using local_err memory: Remove object_property_add_child_array() qom: Add automatic arrayification to object_property_add() machine: Clean up -machine handling qom: Make object_child_foreach() safe for objects removal Signed-off-by: Peter Maydell --- fd884c07658d02a96a882b8457d6d7a5cd71a407