Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx

[Luiz Capitulino <lcapitulino@redhat.com>]

On Mon, 12 Aug 2013 10:19:52 -0400
Luiz Capitulino <lcapitulino@redhat.com> wrote:

> On Thu,  8 Aug 2013 20:05:48 +0300
> Orit Wasserman <owasserm@redhat.com> wrote:
> 
> > "ram" is present also when migration completes.
> > expected-downtime, total-time and downtime are no longer part of "ram" data.
> > 
> > Signed-off-by: Orit Wasserman <owasserm@redhat.com>
> 
> Applied to the qmp branch, thanks.

This one missed the deadline for 1.6. I'm my updating my tree for 1.7,
but this patch conflicts with 8f3067, which repeated for the setup-time
key the mistake this patch is fixing for other keys.

We need a respin for this patch, which should also move setup-time
to the main dict. Orit, I can do it myself if you want.

> 
> > ---
> >  qmp-commands.hx | 20 ++++++++++----------
> >  1 file changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/qmp-commands.hx b/qmp-commands.hx
> > index 2e59b0d..a22a841 100644
> > --- a/qmp-commands.hx
> > +++ b/qmp-commands.hx
> > @@ -2626,8 +2626,8 @@ The main json-object contains the following:
> >  - "expected-downtime": only present while migration is active
> >                  total amount in ms for downtime that was calculated on
> >                  the last bitmap round (json-int)
> > -- "ram": only present if "status" is "active", it is a json-object with the
> > -  following RAM information:
> > +- "ram": only present if "status" is "active" or "complete", it is a
> > +         json-object with the following RAM information:
> >           - "transferred": amount transferred in bytes (json-int)
> >           - "remaining": amount remaining to transfer in bytes (json-int)
> >           - "total": total amount of memory in bytes (json-int)
> > @@ -2669,12 +2669,12 @@ Examples:
> >  -> { "execute": "query-migrate" }
> >  <- { "return": {
> >          "status": "completed",
> > +        "total-time":12345,
> > +        "downtime":12345,
> >          "ram":{
> >            "transferred":123,
> >            "remaining":123,
> >            "total":246,
> > -          "total-time":12345,
> > -          "downtime":12345,
> >            "duplicate":123,
> >            "normal":123,
> >            "normal-bytes":123456
> > @@ -2693,12 +2693,12 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "ram":{
> >              "transferred":123,
> >              "remaining":123,
> >              "total":246,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":123,
> >              "normal":123,
> >              "normal-bytes":123456
> > @@ -2712,12 +2712,12 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "ram":{
> >              "total":1057024,
> >              "remaining":1053304,
> >              "transferred":3720,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":123,
> >              "normal":123,
> >              "normal-bytes":123456
> > @@ -2736,13 +2736,13 @@ Examples:
> >  <- {
> >        "return":{
> >           "status":"active",
> > +         "total-time":12345,
> > +         "expected-downtime":12345,
> >           "capabilities" : [ { "capability": "xbzrle", "state" : true } ],
> >           "ram":{
> >              "total":1057024,
> >              "remaining":1053304,
> >              "transferred":3720,
> > -            "total-time":12345,
> > -            "expected-downtime":12345,
> >              "duplicate":10,
> >              "normal":3333,
> >              "normal-bytes":3412992
>