path: root/qapi-schema.json
diff options
authorMarkus Armbruster <armbru@redhat.com>2017-07-18 12:04:54 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-07-24 13:35:11 +0200
commit8cc99dcdc264bc896926e43e7576c7b7ab633d70 (patch)
treeac58d5ec3a45d88f79008afb025a4c7bba3e1172 /qapi-schema.json
parent7e91e82044f8d23acfb9949a2cdd667a6b239acd (diff)
migration: Clean up around tls_creds, tls_hostname
Optional MigrationParameters members tls_creds and tls_hostname can't actually be absent outside qmp_migrate_set_parameters() since commit 4af245d (v2.9.0). Note that commit 4af245d reverted the part of commit de63ab6 (v2.8.0) that made tls_creds and tls_hostname absent instead of "" in the value of query-migrate-parameters, even though commit de63ab6 called that a mistake. What a mess. Drop the redundant tests for presence, and update documentation. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'qapi-schema.json')
1 files changed, 5 insertions, 6 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index 58d3a0209f..a9c2f052a6 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1054,9 +1054,7 @@
# @MigrationParameters:
# Optional members can be omitted on input ('migrate-set-parameters')
-# but most members will always be present on output
-# ('query-migrate-parameters'), with the exception of tls-creds and
-# tls-hostname.
+# but members will always be present on output.
# @compress-level: compression level
@@ -1077,10 +1075,10 @@
# channel. On the outgoing side of the migration, the credentials
# must be for a 'client' endpoint, while for the incoming side the
# 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)
+# to a non-empty string enables TLS for all migrations.
# An empty string means that QEMU will use plain text mode for
-# migration, rather than TLS (Since 2.9)
+# migration, rather than TLS (Since 2.7)
+# Note: 2.8 reports this by omitting tls-creds instead.
# @tls-hostname: hostname of the target host for the migration. This
# is required when using x509 based TLS credentials and the
@@ -1090,6 +1088,7 @@
# 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)
+# Note: 2.8 reports this by omitting tls-hostname instead.
# @max-bandwidth: to set maximum speed for migration. maximum speed in
# bytes per second. (Since 2.8)