summary refs log tree commit diff stats
path: root/migration/qemu-file-unix.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-25 16:20:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-25 16:20:58 +0000
commitc7933a80bc6f3bb79c341f8fc17b4cf76622e2f3 (patch)
treec3fb00be709f6a464dcebc3b2b86b04f2b5039b5 /migration/qemu-file-unix.c
parent1a4dab849d5d06191ab5e5850f6b8bfcad8ceb47 (diff)
parentf77dcdbc76dbf9bade9739e85e1013639e535835 (diff)
downloadfocaccia-qemu-c7933a80bc6f3bb79c341f8fc17b4cf76622e2f3.tar.gz
focaccia-qemu-c7933a80bc6f3bb79c341f8fc17b4cf76622e2f3.zip
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151125' into staging
migration/next for 20151125

# gpg: Signature made Wed 25 Nov 2015 14:28:47 GMT using RSA key ID 5872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"

* remotes/juanquintela/tags/migration/20151125:
  block-migration: limit the memory usage
  Assume madvise for (no)hugepage works

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/qemu-file-unix.c')
0 files changed, 0 insertions, 0 deletions