Re: [Qemu-devel] For 1.2: Re: [PATCH 3/8] migration: move total_time from ram stats to migration info

[Luiz Capitulino]

On Sat, 18 Aug 2012 07:02:50 -0600
Eric Blake <address@hidden> wrote:

> On 08/18/2012 05:17 AM, Juan Quintela wrote:
> > Signed-off-by: Juan Quintela <address@hidden>
> > ---
> >  hmp.c            |  4 ++--
> >  migration.c      |  6 +++---
> >  qapi-schema.json | 14 +++++++-------
> >  qmp-commands.hx  |  6 +++---
> >  4 files changed, 15 insertions(+), 15 deletions(-)
> > 
> 
> > +++ b/qapi-schema.json
> > @@ -290,10 +290,6 @@
> >  #
> >  # @total: total amount of bytes involved in the migration process
> >  #
> > -# @total-time: total amount of ms since migration started.  If
> > -#        migration has ended, it returns the total migration
> > -#        time. (since 1.2)
> > -#
> >  # @duplicate: number of duplicate pages (since 1.2)
> >  #
> >  # @normal : number of normal pages (since 1.2)
> > @@ -304,8 +300,7 @@
> >  ##
> >  { 'type': 'MigrationStats',
> >    'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
> > -           'total-time': 'int', 'duplicate': 'int', 'normal': 'int',
> > -           'normal-bytes': 'int' } }
> > +           'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int' } }
> > 
> >  ##
> >  # @XBZRLECacheStats
> > @@ -350,12 +345,17 @@
> >  #                migration statistics, only returned if XBZRLE feature is 
> > on and
> >  #                status is 'active' or 'completed' (since 1.2)
> >  #
> > +# @total-time: total amount of milliseconds since migration started.
> > +#        If migration has ended, it returns the total migration
> > +#        time. (since 1.2)

Field is optional, needs to be marked as such and the has_total_time field
should be set appropriately.

> > +#
> >  # Since: 0.14.0
> >  ##
> >  { 'type': 'MigrationInfo',
> >    'data': {'*status': 'str', '*ram': 'MigrationStats',
> >             '*disk': 'MigrationStats',
> > -           '*xbzrle-cache': 'XBZRLECacheStats'} }
> > +           '*xbzrle-cache': 'XBZRLECacheStats',
> > +           'total-time': 'int'} }
> 
> Anthony - are you planning on taking this series for 1.2?  If we don't
> get this patch in on time, then taking this for 1.3 would result in
> changing released QMP interface (right now, there has been no release
> with the field in the wrong type).

I can cherry-pick this into the qmp branch.

Juan, I can also fix myself the problem I pointed out above if that
works for you.