]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/qmp-unstable/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 23 Oct 2014 16:05:15 +0000 (17:05 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 23 Oct 2014 16:05:15 +0000 (17:05 +0100)
QMP patches

# gpg: Signature made Thu 23 Oct 2014 16:05:52 BST using RSA key ID E24ED5A7
# gpg: Good signature from "Luiz Capitulino <lcapitulino@gmail.com>"

* 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 <peter.maydell@linaro.org>

Trivial merge