From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SySEq-0002uH-Ef for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:41:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SySEo-0002Fd-Td for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:41:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SySEo-0002Em-KX for qemu-devel@nongnu.org; Mon, 06 Aug 2012 14:41:10 -0400 From: Orit Wasserman Date: Mon, 6 Aug 2012 20:51:27 +0300 Message-Id: <1344275489-28789-11-git-send-email-owasserm@redhat.com> In-Reply-To: <1344275489-28789-1-git-send-email-owasserm@redhat.com> References: <1344275489-28789-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH 10/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 Signed-off-by: Orit Wasserman --- qapi-schema.json | 4 ++-- qmp-commands.hx | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index 8cc40e2..3238403 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) # @@ -274,7 +274,7 @@ ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'total_time': 'int', 'duplicate': 'int', 'normal': 'int', + 'total-time': 'int', 'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int' } } ## diff --git a/qmp-commands.hx b/qmp-commands.hx index 0087079..1a1b2cf 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) - "duplicate": number of duplicated pages (json-int) - "normal" : number of normal pages transferred (json-int) - "normal-bytes" : number of normal bytes transferred (json-int) @@ -2145,6 +2148,7 @@ Examples: "transferred":123, "remaining":123, "total":246, + "total-time":12345, "duplicate":123, "normal":123, "normal-bytes":123456 @@ -2167,6 +2171,7 @@ Examples: "transferred":123, "remaining":123, "total":246, + "total-time":12345, "duplicate":123, "normal":123, "normal-bytes":123456 @@ -2184,6 +2189,7 @@ Examples: "total":1057024, "remaining":1053304, "transferred":3720, + "total-time":12345, "duplicate":123, "normal":123, "normal-bytes":123456 -- 1.7.7.6