On 08/08/2013 05:50 PM, Luiz Capitulino wrote: > On Thu, 8 Aug 2013 11:46:14 +0300 > Orit Wasserman <owass...@redhat.com> wrote: > >> "ram" is present also when migration completes. >> total-time and downtime are no longer part of "ram" data. > > expected-downtime has to be moved too, looks good otherwise.
I will fix it in a separate patch. Orit > >> >> Signed-off-by: Orit Wasserman <owass...@redhat.com> >> --- >> qmp-commands.hx | 14 +++++++------- >> 1 file changed, 7 insertions(+), 7 deletions(-) >> >> diff --git a/qmp-commands.hx b/qmp-commands.hx >> index 2e59b0d..1d43f4c 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,11 +2693,11 @@ Examples: >> <- { >> "return":{ >> "status":"active", >> + "total-time":12345, >> "ram":{ >> "transferred":123, >> "remaining":123, >> "total":246, >> - "total-time":12345, >> "expected-downtime":12345, >> "duplicate":123, >> "normal":123, >> @@ -2712,11 +2712,11 @@ Examples: >> <- { >> "return":{ >> "status":"active", >> + "total-time":12345, >> "ram":{ >> "total":1057024, >> "remaining":1053304, >> "transferred":3720, >> - "total-time":12345, >> "expected-downtime":12345, >> "duplicate":123, >> "normal":123, >> @@ -2736,12 +2736,12 @@ Examples: >> <- { >> "return":{ >> "status":"active", >> + "total-time":12345, >> "capabilities" : [ { "capability": "xbzrle", "state" : true } ], >> "ram":{ >> "total":1057024, >> "remaining":1053304, >> "transferred":3720, >> - "total-time":12345, >> "expected-downtime":12345, >> "duplicate":10, >> "normal":3333, >