diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-16 15:32:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-16 15:32:08 +0000 |
| commit | c5e737e5fbb8e48f9371764cc156ed15f4047a00 (patch) | |
| tree | e228bd7044d11f00442ab20258b5dababf9b8565 /qapi-schema.json | |
| parent | 094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe (diff) | |
| parent | 8679638b0e231f97ad3456c681bf569ca7f7f6d5 (diff) | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170316' into staging
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>
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 1d7b1cd1c7..68a43274bf 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1059,6 +1059,8 @@ # 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: hostname of the target host for the migration. This # is required when using x509 based TLS credentials and the @@ -1066,6 +1068,8 @@ # example if using fd: or exec: based migration, the # hostname must be provided so that the server's x509 # certificate identity can be validated. (Since 2.7) +# An empty string means that QEMU will use the hostname +# associated with the migration URI, if any. (Since 2.9) # # @max-bandwidth: to set maximum speed for migration. maximum speed in # bytes per second. (Since 2.8) |