summary refs log tree commit diff stats
path: root/hw/pci-host/bonito.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-03-08 12:47:13 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-03-08 12:47:13 +0000
commit9c31a8219a8fb6e790d5510987ae2c810ff968b5 (patch)
tree5c5edf0a2689898e157e696dc94cc270224f0db7 /hw/pci-host/bonito.c
parent033c7ddf86fe4315069ac4cf3cfab9bc6035dee7 (diff)
parenta3b042179859c68b3d08f8aa43866d28d6b56987 (diff)
downloadfocaccia-qemu-9c31a8219a8fb6e790d5510987ae2c810ff968b5.tar.gz
focaccia-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/bonito.c')
0 files changed, 0 insertions, 0 deletions