From patchwork Thu Aug 8 17:05:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orit Wasserman X-Patchwork-Id: 265786 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A048C2C00AC for ; Fri, 9 Aug 2013 03:05:28 +1000 (EST) Received: from localhost ([::1]:45427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7TeQ-0005Tj-Oc for incoming@patchwork.ozlabs.org; Thu, 08 Aug 2013 13:05:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7Te2-0005Nc-Px for qemu-devel@nongnu.org; Thu, 08 Aug 2013 13:05:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V7Tdw-0000w2-Kz for qemu-devel@nongnu.org; Thu, 08 Aug 2013 13:05:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V7Tdw-0000vs-Cr for qemu-devel@nongnu.org; Thu, 08 Aug 2013 13:04:56 -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 r78H4tQC027916 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 8 Aug 2013 13:04:55 -0400 Received: from dhcp-1-120.tlv.redhat.com (vpn-201-218.tlv.redhat.com [10.35.201.218]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r78H4nrp021008; Thu, 8 Aug 2013 13:04:51 -0400 From: Orit Wasserman To: qemu-devel@nongnu.org Date: Thu, 8 Aug 2013 20:05:48 +0300 Message-Id: <1375981548-18567-1-git-send-email-owasserm@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Orit Wasserman , lcapitulino@redhat.com, armbru@redhat.com, quintela@redhat.com Subject: [Qemu-devel] [PATCH v2] Fix query-migrate documentation in qmp-commands.hx X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org "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 Reviewed-by: Eric Blake --- 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