From patchwork Tue Aug 21 12:39:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia Lina X-Patchwork-Id: 960347 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baidu.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41vshH3ksGz9s4v for ; Tue, 21 Aug 2018 23:58:07 +1000 (AEST) Received: from localhost ([::1]:53743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs7Ab-0006xs-5L for incoming@patchwork.ozlabs.org; Tue, 21 Aug 2018 09:58:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46249) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs66A-0005t7-6w for qemu-devel@nongnu.org; Tue, 21 Aug 2018 08:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fs666-0006cw-Ri for qemu-devel@nongnu.org; Tue, 21 Aug 2018 08:49:26 -0400 Received: from mx21.baidu.com ([220.181.3.85]:42292 helo=baidu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs666-0006aS-H5 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 08:49:22 -0400 Received: from M1-MAIL-EX03.internal.baidu.com (unknown [10.44.83.52]) by Forcepoint Email with ESMTPS id 402F65B661410; Tue, 21 Aug 2018 20:49:13 +0800 (CST) Received: from 9B900DC7A53C154.internal.baidu.com (172.31.63.8) by M1-MAIL-EX03.internal.baidu.com (10.44.83.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1531.3; Tue, 21 Aug 2018 20:49:13 +0800 From: To: , , , Date: Tue, 21 Aug 2018 20:39:26 +0800 Message-ID: <20180821123926.17412-1-jialina01@baidu.com> X-Mailer: git-send-email 2.13.2.windows.1 MIME-Version: 1.0 X-Originating-IP: [172.31.63.8] X-ClientProxiedBy: M1-MAIL-EX08.internal.baidu.com (10.44.83.56) To M1-MAIL-EX03.internal.baidu.com (10.44.83.52) X-Baidu-BdMsfe-DateCheck: 1_M1-MAIL-EX03_2018-08-21 20:49:13:732 X-Baidu-BdMsfe-VirusCheck: M1-MAIL-EX03_GRAY_Inside_WithoutAtta_2018-08-21 20:49:13:764 X-Baidu-BdMsfe-DateCheck: 1_M1-MAIL-EX03_2018-08-21 20:49:13:795 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.3.85 X-Mailman-Approved-At: Tue, 21 Aug 2018 09:17:42 -0400 Subject: [Qemu-devel] [PATCH] qapi/migration.json: fix the description for "query-migrate" output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jialina01 , qemu-devel@nongnu.org, chaiwen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: jialina01 In the return for command "query-migrate", time information like "total-time", "setup-time", "downtime", is not included in ram json-object. So fix the description in migration.json by unpacking those information from ram json-object. Signed-off-by: jialina01 Signed-off-by: chaiwen Reviewed-by: Juan Quintela --- qapi/migration.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/qapi/migration.json b/qapi/migration.json index 186e8a7303..4040728439 100644 --- a/qapi/migration.json +++ b/qapi/migration.json @@ -212,13 +212,13 @@ # -> { "execute": "query-migrate" } # <- { "return": { # "status": "completed", +# "total-time":12345, +# "setup-time":12345, +# "downtime":12345, # "ram":{ # "transferred":123, # "remaining":123, # "total":246, -# "total-time":12345, -# "setup-time":12345, -# "downtime":12345, # "duplicate":123, # "normal":123, # "normal-bytes":123456, @@ -238,13 +238,13 @@ # <- { # "return":{ # "status":"active", +# "total-time":12345, +# "setup-time":12345, +# "expected-downtime":12345, # "ram":{ # "transferred":123, # "remaining":123, # "total":246, -# "total-time":12345, -# "setup-time":12345, -# "expected-downtime":12345, # "duplicate":123, # "normal":123, # "normal-bytes":123456, @@ -259,13 +259,13 @@ # <- { # "return":{ # "status":"active", +# "total-time":12345, +# "setup-time":12345, +# "expected-downtime":12345, # "ram":{ # "total":1057024, # "remaining":1053304, # "transferred":3720, -# "total-time":12345, -# "setup-time":12345, -# "expected-downtime":12345, # "duplicate":123, # "normal":123, # "normal-bytes":123456, @@ -285,14 +285,13 @@ # <- { # "return":{ # "status":"active", -# "capabilities" : [ { "capability": "xbzrle", "state" : true } ], +# "total-time":12345, +# "setup-time":12345, +# "expected-downtime":12345, # "ram":{ # "total":1057024, # "remaining":1053304, # "transferred":3720, -# "total-time":12345, -# "setup-time":12345, -# "expected-downtime":12345, # "duplicate":10, # "normal":3333, # "normal-bytes":3412992,