]> git.proxmox.com Git - mirror_qemu.git/commit
projects / mirror_qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 033c7dd a3b0421)
Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sun, 8 Mar 2015 12:47:13 +0000 (12:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sun, 8 Mar 2015 12:47:13 +0000 (12:47 +0000)
commit9c31a8219a8fb6e790d5510987ae2c810ff968b5
tree5c5edf0a2689898e157e696dc94cc270224f0db7tree
parent033c7ddf86fe4315069ac4cf3cfab9bc6035dee7commit | diff
parenta3b042179859c68b3d08f8aa43866d28d6b56987commit | diff
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 <peter.maydell@linaro.org>
trace-events diff1 | diff2 | blob | history
QEMU mirror