From: Peter Maydell Date: Mon, 12 Oct 2015 10:07:38 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-09' into staging X-Git-Tag: v2.5.0-rc0~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=768492239014cb5e6161f1be80a9c8043c4530c2;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-09' into staging Fix device introspection regressions # gpg: Signature made Fri 09 Oct 2015 14:43:41 BST using RSA key ID EB918653 # gpg: Good signature from "Markus Armbruster " # gpg: aka "Markus Armbruster " * remotes/armbru/tags/pull-monitor-2015-10-09: Revert "qdev: Use qdev_get_device_class() for -device ,help" qdev: Protect device-list-properties against broken devices qmp: Fix device-list-properties not to crash for abstract device device-introspect-test: New, covering device introspection libqtest: New hmp() & friends libqtest: Clean up unused QTestState member sigact_old tests: Fix how qom-test is run macio: move DBDMA_init from instance_init to realize hw: do not pass NULL to memory_region_init from instance_init memory: allow destroying a non-empty MemoryRegion virtio-input: Fix device introspection on non-Linux hosts update-linux-headers: Rename SW_MAX to SW_MAX_ Signed-off-by: Peter Maydell --- 768492239014cb5e6161f1be80a9c8043c4530c2