From: Peter Maydell Date: Sun, 8 Mar 2015 12:47:13 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9c31a8219a8fb6e790d5510987ae2c810ff968b5;p=qemu.git Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging * remotes/qmp-unstable/queue/qmp: docs: add memory-hotplug.txt qemu-options.hx: improve -m description virtio-balloon: Add some trace events virtio-balloon: Fix balloon not working correctly when hotplug memory pc-dimm: add a function to calculate VM's current RAM size Signed-off-by: Peter Maydell --- 9c31a8219a8fb6e790d5510987ae2c810ff968b5