diff options
author | Peter Maydell | 2015-03-08 13:47:13 +0100 |
---|---|---|
committer | Peter Maydell | 2015-03-08 13:47:13 +0100 |
commit | 9c31a8219a8fb6e790d5510987ae2c810ff968b5 (patch) | |
tree | 5c5edf0a2689898e157e696dc94cc270224f0db7 /hw/pci-host/grackle.c | |
parent | Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150304-1' into ... (diff) | |
parent | docs: add memory-hotplug.txt (diff) | |
download | qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.tar.gz qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.tar.xz qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.zip |
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>
Diffstat (limited to 'hw/pci-host/grackle.c')
0 files changed, 0 insertions, 0 deletions