* Eric Blake (ebl...@redhat.com) wrote: > On 1/28/19 11:03 AM, Dr. David Alan Gilbert (git) wrote: > > 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> > > --- > > > +++ b/qapi/migration.json > > @@ -6,6 +6,7 @@ > > ## > > > > { 'include': 'common.json' } > > +{ 'include': 'net.json' } > > > > ## > > # @MigrationStats: > > @@ -480,6 +481,18 @@ > > # > > # Migration parameters enumeration > > # > > +# @announce-initial: Inital delay (in ms) before sending the first announce > > s/Inital/Initial/ [2]
Fixed. > > +# (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) > > +# > > The new parameters are optional below [1]; should they have a default > value documented, and are there any constraints such that if you set > one, you must set all four to match the previous' patch having all four > be non-optional? I think this is just the same as all the other migration-parameters isn't it? It's the way that the 'migrate-set-parameters' command allows you to set an individual parameter without changing the others; it's not about defaults, just that whatever setting you currently have doesn't change. > > > @@ -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', > > [1] mentioned above > > > '*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) > > [2] again > Fixed. > > > @@ -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', > > [1] again > > > '*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' } } > > Why the whitespace churn? Removed (although I think the extra space is cleaner). Dave > -- > Eric Blake, Principal Software Engineer > Red Hat, Inc. +1-919-301-3226 > Virtualization: qemu.org | libvirt.org > -- Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK