From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56821) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7Lro-0003zX-4G for qemu-devel@nongnu.org; Thu, 08 Aug 2013 04:46:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7Lri-0000Qh-5n for qemu-devel@nongnu.org; Thu, 08 Aug 2013 04:46:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7Lrh-0000QV-UH for qemu-devel@nongnu.org; Thu, 08 Aug 2013 04:46:38 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r788kaRx026990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Aug 2013 04:46:36 -0400 From: Orit Wasserman Date: Thu, 8 Aug 2013 11:46:14 +0300 Message-Id: <1375951574-1014-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH] Fix query-migrate documentation in qmp-commands.hx List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Orit Wasserman , lcapitulino@redhat.com, armbru@redhat.com, quintela@redhat.com "ram" is present also when migration completes. total-time and downtime are no longer part of "ram" data. Signed-off-by: Orit Wasserman --- 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, -- 1.8.1.4