"Dr. David Alan Gilbert (git)" <dgilb...@redhat.com> writes:
> From: "Dr. David Alan Gilbert" <dgilb...@redhat.com>
>
> Add migration parameters that control RARP/GARP announcement timeouts.
>
> Based on earlier patches by myself and
> Vladislav Yasevich <vyase...@redhat.com>
>
> Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
[...]
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 7a795ecc16..868071d3a0 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -6,6 +6,7 @@
> ##
>
> { 'include': 'common.json' }
> +{ 'include': 'net.json' }
>
> ##
> # @MigrationStats:
This hunk looks superfluous.
> @@ -480,6 +481,18 @@
> #
> # Migration parameters enumeration
> #
> +# @announce-initial: Inital delay (in ms) before sending the first announce
> +# (Since 4.0)
Current master has one instance of ms in qapi/, 9 of milliseconds. I'd
stick to the more common spelling.
> +#
> +# @announce-max: Maximum delay (in ms) between packets in the announcment
> +# (Since 4.0)
> +#
> +# @announce-rounds: Number of self-announce packets sent after migration
> +# (Since 4.0)
> +#
> +# @announce-step: Increase in delay (in ms) between subsequent packets in
> +# the announcement (Since 4.0)
> +#
> # @compress-level: Set the compression level to be used in live migration,
> # the compression level is an integer between 0 and 9, where 0 means
> # no compression, 1 means the best compression speed, and 9 means
> best
> @@ -557,10 +570,13 @@
> #
> # @max-cpu-throttle: maximum cpu throttle percentage.
> # Defaults to 99. (Since 3.1)
> +#
> # Since: 2.4
> ##
> { 'enum': 'MigrationParameter',
> - 'data': ['compress-level', 'compress-threads', 'decompress-threads',
> + 'data': ['announce-initial', 'announce-max',
> + 'announce-rounds', 'announce-step',
> + 'compress-level', 'compress-threads', 'decompress-threads',
> 'compress-wait-thread',
> 'cpu-throttle-initial', 'cpu-throttle-increment',
> 'tls-creds', 'tls-hostname', 'max-bandwidth',
> @@ -572,6 +588,18 @@
> ##
> # @MigrateSetParameters:
> #
> +# @announce-initial: Inital delay (in ms) before sending the first announce
> +# (Since 4.0)
> +#
> +# @announce-max: Maximum delay (in ms) between packets in the announcment
> +# (Since 4.0)
> +#
> +# @announce-rounds: Number of self-announce packets sent after migration
> +# (Since 4.0)
> +#
> +# @announce-step: Increase in delay (in ms) between subsequent packets in
> +# the announcement (Since 4.0)
> +#
> # @compress-level: compression level
> #
> # @compress-threads: compression thread count
> @@ -653,7 +681,11 @@
> # TODO either fuse back into MigrationParameters, or make
> # MigrationParameters members mandatory
> { 'struct': 'MigrateSetParameters',
> - 'data': { '*compress-level': 'int',
> + 'data': { '*announce-initial': 'size',
> + '*announce-max': 'size',
> + '*announce-rounds': 'size',
> + '*announce-step': 'size',
> + '*compress-level': 'int',
> '*compress-threads': 'int',
> '*compress-wait-thread': 'bool',
> '*decompress-threads': 'int',
> @@ -692,6 +724,18 @@
> #
> # The optional members aren't actually optional.
> #
> +# @announce-initial: Inital delay (in ms) before sending the first announce
> +# (Since 4.0)
> +#
> +# @announce-max: Maximum delay (in ms) between packets in the announcment
> +# (Since 4.0)
> +#
> +# @announce-rounds: Number of self-announce packets sent after migration
> +# (Since 4.0)
> +#
> +# @announce-step: Increase in delay (in ms) between subsequent packets in
> +# the announcement (Since 4.0)
> +#
> # @compress-level: compression level
> #
> # @compress-threads: compression thread count
> @@ -769,7 +813,11 @@
> # Since: 2.4
> ##
> { 'struct': 'MigrationParameters',
> - 'data': { '*compress-level': 'uint8',
> + 'data': { '*announce-initial': 'size',
> + '*announce-max': 'size',
> + '*announce-rounds': 'size',
> + '*announce-step': 'size',
> + '*compress-level': 'uint8',
> '*compress-threads': 'uint8',
> '*compress-wait-thread': 'bool',
> '*decompress-threads': 'uint8',
> @@ -785,7 +833,7 @@
> '*x-multifd-page-count': 'uint32',
> '*xbzrle-cache-size': 'size',
> '*max-postcopy-bandwidth': 'size',
> - '*max-cpu-throttle':'uint8'} }
> + '*max-cpu-throttle':'uint8' } }
>
> ##
> # @query-migrate-parameters:
Since you're tidying up whitespace, consider expanding the tab.
With the superfluous hunk dropped, QAPI part
Acked-by: Markus Armbruster <arm...@redhat.com>
