On 08/05/2012 03:13 AM, Orit Wasserman wrote: > Signed-off-by: Benoit Hudzia <benoit.hud...@sap.com> > Signed-off-by: Petter Svard <pett...@cs.umu.se> > Signed-off-by: Aidan Shribman <aidan.shrib...@sap.com> > Signed-off-by: Orit Wasserman <owass...@redhat.com> > Signed-off-by: Juan Quintela <quint...@redhat.com> > ---
> +++ b/qapi-schema.json
> @@ -264,11 +264,18 @@
> # migration has ended, it returns the total migration
> # time. (since 1.2)
> #
> -# Since: 0.14.0.
> +# @duplicate: number of duplicate pages (since 1.2)
> +#
> +# @normal : number of normal pages (since 1.2)
> +#
> +# @normal-bytes : number of normal bytes sent (since 1.2)
> +#
> +# Since: 0.14.0
> ##
> { 'type': 'MigrationStats',
> 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' ,
> - 'total_time': 'int' } }
> + 'total_time': 'int', 'duplicate': 'int', 'normal': 'int',
> + 'normal-bytes': 'int' } }
Yuck - we're mixing _ and - in the same command. Thankfully,
'total_time' did not exist in 1.1, therefore, I suggest that you enhance
this patch (or else add a prereq patch) to rename
s/total_time/total-time/ so that the 1.2 release will consistently use '-'.
Oh, and when doing that, s/tota0l/total/ in the context one line before
this hunk started.
>
> ##
> # @MigrationInfo
> diff --git a/qmp-commands.hx b/qmp-commands.hx
> index 274680d..d7ec281 100644
> --- a/qmp-commands.hx
> +++ b/qmp-commands.hx
> @@ -2120,6 +2120,9 @@ The main json-object contains the following:
> - "transferred": amount transferred (json-int)
> - "remaining": amount remaining (json-int)
> - "total": total (json-int)
> + - "duplicate": number of duplicated pages (json-int)
> + - "normal" : number of normal pages transferred (json-int)
> + - "normal-bytes" : number of normal bytes transferred (json-int)
Kill those TABs. Inconsistent spacing before ':'.
> 2. Migration is done and has succeeded
>
> -> { "execute": "query-migrate" }
> -<- { "return": { "status": "completed" } }
> +<- { "return": {
> + "status": "completed",
> + "ram":{
> + "transferred":123,
> + "remaining":123,
> + "total":246,
> + "duplicate":123,
> + "normal":123,
> + "normal-bytes":123456
As long as we're fixing this example, fix it to also show 'total-time'.
> + }
> + }
> + }
>
> 3. Migration is done and has failed
>
> @@ -2152,7 +2166,10 @@ Examples:
> "ram":{
> "transferred":123,
> "remaining":123,
> - "total":246
> + "total":246,
> + "duplicate":123,
> + "normal":123,
> + "normal-bytes":123456
Again, need total-time.
> }
> }
> }
> @@ -2166,7 +2183,10 @@ Examples:
> "ram":{
> "total":1057024,
> "remaining":1053304,
> - "transferred":3720
> + "transferred":3720,
> + "duplicate":123,
> + "normal":123,
> + "normal-bytes":123456
and again.
--
Eric Blake ebl...@redhat.com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
