From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8t26-0004RG-5Y for qemu-devel@nongnu.org; Mon, 12 Aug 2013 10:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8t1w-0005Ii-R7 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 10:23:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48611) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8t1w-0005Id-JQ for qemu-devel@nongnu.org; Mon, 12 Aug 2013 10:23:32 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7CENVoE002252 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 12 Aug 2013 10:23:31 -0400 Date: Mon, 12 Aug 2013 10:19:52 -0400 From: Luiz Capitulino Message-ID: <20130812101952.2f065724@redhat.com> In-Reply-To: <1375981548-18567-1-git-send-email-owasserm@redhat.com> References: <1375981548-18567-1-git-send-email-owasserm@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Orit Wasserman Cc: armbru@redhat.com, qemu-devel@nongnu.org, quintela@redhat.com On Thu, 8 Aug 2013 20:05:48 +0300 Orit Wasserman 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 Applied to the qmp branch, thanks. > --- > 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