From: Peter Maydell Date: Thu, 23 Oct 2014 16:05:15 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1430500bb8ba0bf15bad235439d62276c1b6b22f;p=qemu.git Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging QMP patches # gpg: Signature made Thu 23 Oct 2014 16:05:52 BST using RSA key ID E24ED5A7 # gpg: Good signature from "Luiz Capitulino " * remotes/qmp-unstable/tags/for-upstream: monitor: delete device_del_bus_completion monitor: add del completion for peripheral device qdev: add qdev_build_hotpluggable_device_list helper MAINTAINERS: add entry for qobject files dump: Turn some functions to void to make code cleaner dump: Propagate errors into qmp_dump_guest_memory() virtio-balloon: Tweak recent fix for integer overflow Signed-off-by: Peter Maydell --- 1430500bb8ba0bf15bad235439d62276c1b6b22f