From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SySH8-0007yK-Ek for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:43:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SySH7-0003F6-C1 for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:43:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SySH7-0003F1-2M for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:43:33 -0400 From: Orit Wasserman Date: Mon, 6 Aug 2012 21:42:55 +0300 Message-Id: <1344278578-1062-10-git-send-email-owasserm@redhat.com> In-Reply-To: <1344278578-1062-1-git-send-email-owasserm@redhat.com> References: <1344278578-1062-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH 09/12] Change total_time to total-time in MigrationStats List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, aliguori@us.ibm.com, quintela@redhat.com, stefanha@gmail.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com, blauwirbel@gmail.com, Orit Wasserman , chegu_vinod@hp.com, avi@redhat.com, pbonzini@redhat.com, eblake@redhat.com migration total_time was introduced in commit d5f8a5701d3690b5ec0c34b6a5c0b5a24d274540 for QEMU 1.2 Signed-off-by: Orit Wasserman --- qapi-schema.json | 4 ++-- qmp-commands.hx | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index c899032..5bae2c7 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -260,7 +260,7 @@ # # @total: total amount of bytes involved in the migration process # -# @total_time: tota0l amount of ms since migration started. If +# @total-time: total amount of ms since migration started. If # migration has ended, it returns the total migration # time. (since 1.2) # @@ -268,7 +268,7 @@ ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'total_time': 'int' } } + 'total-time': 'int' } } ## # @MigrationInfo diff --git a/qmp-commands.hx b/qmp-commands.hx index 50576bf..4302676 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -2120,6 +2120,9 @@ The main json-object contains the following: - "transferred": amount transferred (json-int) - "remaining": amount remaining (json-int) - "total": total (json-int) + - "total-time": total amount of ms since migration started. If + migration has ended, it returns the total migration time + (json-int) - "disk": only present if "status" is "active" and it is a block migration, it is a json-object with the following disk information (in bytes): - "transferred": amount transferred (json-int) @@ -2152,7 +2155,8 @@ Examples: "ram":{ "transferred":123, "remaining":123, - "total":246 + "total":246, + "total-time":12345 } } } @@ -2166,7 +2170,8 @@ Examples: "ram":{ "total":1057024, "remaining":1053304, - "transferred":3720 + "transferred":3720, + "total-time":12345 }, "disk":{ "total":20971520, -- 1.7.7.6