Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170316' into...

migration/next for 20170316

# gpg: Signature made Thu 16 Mar 2017 08:21:51 GMT
# gpg:                using RSA key 0xF487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg:                 aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/migration/20170316:
  postcopy: Check for shared memory
  RAMBlocks: qemu_ram_is_shared
  vmstate: fix failed iotests case 68 and 91
  migration/block: Avoid invoking blk_drain too frequently
  migration: use "" as the default for tls-creds/hostname
  Change the method to calculate dirty-pages-rate

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --cc qapi-schema.json
index 1d7b1cd1c795d9f0c09239842114f9404fceb6cf,eb9bf67bd9750bdfac28f3f23eeda7dd28a2c83b..68a43274bf1c07da16c65962d8afabc81467c43d
--- 1/qapi-schema.json
--- 2/qapi-schema.json
+++ b/qapi-schema.json
@@@ -1059,8 -1036,10 +1059,10 @@@
  #             credentials must be for a 'server' endpoint. Setting this
  #             will enable TLS for all migrations. The default is unset,
  #             resulting in unsecured migration at the QEMU level. (Since 2.7)
+ #             An empty string means that QEMU will use plain text mode for
+ #             migration, rather than TLS (Since 2.9)
  #
 -# @tls-hostname: #optional hostname of the target host for the migration. This
 +# @tls-hostname: hostname of the target host for the migration. This
  #                is required when using x509 based TLS credentials and the
  #                migration URI does not already include a hostname. For
  #                example if using fd: or exec: based migration, the