projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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>
1  2 
trace-events patch | diff1 | diff2 | blob | history

diff --cc trace-events
Simple merge
Unnamed repository; edit this file 'description' to name the repository.