From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 25 Nov 2015 16:20:58 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20151125' into... 
X-Git-Tag: v2.5.0-rc2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7933a80bc6f3bb79c341f8fc17b4cf76622e2f3;p=thirdparty%2Fqemu.git

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>
---

c7933a80bc6f3bb79c341f8fc17b4cf76622e2f3