Message ID | 20211106232941.46184-3-quintela@redhat.com |
---|---|
State | New |
Headers | show |
Series | [PULL,1/2] migration: Check that postcopy fd's are not NULL | expand |
Juan Quintela <quintela@redhat.com> writes: > From: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> > > The patchset merged in 71864eadd9a ("migration/dirtyrate: > introduce struct and adjust DirtyRateStat") was targeting > QEMU 6.1 but got merged later, so correct the tag for 6.2. > > Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Reviewed-by: Juan Quintela <quintela@redhat.com> > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > qapi/migration.json | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/qapi/migration.json b/qapi/migration.json > index 87146ceea2..f0aefdab64 100644 > --- a/qapi/migration.json > +++ b/qapi/migration.json > @@ -1740,7 +1740,7 @@ > # > # @dirty-rate: dirty rate. > # > -# Since: 6.1 > +# Since: 6.2 > # > ## > { 'struct': 'DirtyRateVcpu', > @@ -1774,7 +1774,7 @@ > # > # @dirty-bitmap: calculate dirtyrate by dirty bitmap. > # > -# Since: 6.1 > +# Since: 6.2 > # > ## > { 'enum': 'DirtyRateMeasureMode', > @@ -1796,13 +1796,13 @@ > # @calc-time: time in units of second for sample dirty pages > # > # @sample-pages: page count per GB for sample dirty pages > -# the default value is 512 (since 6.1) > +# the default value is 512 (since 6.2) This one got merged into 6.1 in commit 7afa08cd8fd. Please revert this line. > # > # @mode: mode containing method of calculate dirtyrate includes > -# 'page-sampling' and 'dirty-ring' (Since 6.1) > +# 'page-sampling' and 'dirty-ring' (Since 6.2) > # > # @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring > -# mode specified (Since 6.1) > +# mode specified (Since 6.2) > # > # Since: 5.2 > #
diff --git a/qapi/migration.json b/qapi/migration.json index 87146ceea2..f0aefdab64 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -1740,7 +1740,7 @@ # # @dirty-rate: dirty rate. # -# Since: 6.1 +# Since: 6.2 # ## { 'struct': 'DirtyRateVcpu', @@ -1774,7 +1774,7 @@ # # @dirty-bitmap: calculate dirtyrate by dirty bitmap. # -# Since: 6.1 +# Since: 6.2 # ## { 'enum': 'DirtyRateMeasureMode', @@ -1796,13 +1796,13 @@ # @calc-time: time in units of second for sample dirty pages # # @sample-pages: page count per GB for sample dirty pages -# the default value is 512 (since 6.1) +# the default value is 512 (since 6.2) # # @mode: mode containing method of calculate dirtyrate includes -# 'page-sampling' and 'dirty-ring' (Since 6.1) +# 'page-sampling' and 'dirty-ring' (Since 6.2) # # @vcpu-dirty-rate: dirtyrate for each vcpu if dirty-ring -# mode specified (Since 6.1) +# mode specified (Since 6.2) # # Since: 5.2 #