Fabiano Rosas <faro...@suse.de> writes: > Markus Armbruster <arm...@redhat.com> writes: > >> Fabiano Rosas <faro...@suse.de> writes: >> >>> Now that the TLS options have been made the same between >>> migrate-set-parameters and query-migrate-parameters, a single type can >>> be used. Remove MigrateSetParameters. >>> >>> The TLS options documentation from MigrationParameters were replaced >>> with the ones from MigrateSetParameters which was more complete. >>> >>> Signed-off-by: Fabiano Rosas <faro...@suse.de> >> >> [...] >> >>> diff --git a/qapi/migration.json b/qapi/migration.json >>> index 97bb022c45..3788c39857 100644 >>> --- a/qapi/migration.json >>> +++ b/qapi/migration.json
[...] >>> @@ -1205,8 +1011,8 @@ >>> # @downtime-limit: set maximum tolerated downtime for migration. >>> # maximum downtime in milliseconds (Since 2.8) >>> # >>> -# @x-checkpoint-delay: the delay time between two COLO checkpoints. >>> -# (Since 2.8) >>> +# @x-checkpoint-delay: the delay time between two COLO checkpoints in >>> +# periodic mode. (Since 2.8) >>> # >>> # @multifd-channels: Number of channels used to migrate data in >>> # parallel. This is the same number that the number of sockets >> >> Please add >> >> ## >> # @query-migrate-parameters: >> # >> -# Return information about the current migration parameters >> +# Return information about the current migration parameters. >> +# Optional members of the return value are always present. >> # >> # Returns: @MigrationParameters >> # >> # Since: 2.4 >> # >> >> and double-check "always" is actually true. > > It's not, block-bitmap-mapping needs to be kept optional for > compatibility. > > What about: > > # Return information about the current migration parameters. Optional > # members of the return value are always present, except for > # block-bitmap-mapping that's only present if it has been previously > # set. Suggest "except @block-bitmap-mapping is only present if" or "execpt for @block-bitmap-mapping, which is only present if". >> With that, QAPI schema >> Acked-by: Markus Armbruster <arm...@redhat.com>