summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrit Wasserman <owasserm@redhat.com>2012-08-06 21:42:55 +0300
committerJuan Quintela <quintela@redhat.com>2012-08-08 13:51:12 +0200
commit62d4e3fe31844ee76bf2314bf1c22d25bad37589 (patch)
tree77200fcab03e35b62466f3fcaf1af20402d089ec
parent9e1ba4cc4e2536d9650e84e2614c5691ed45938f (diff)
downloadqemu-62d4e3fe31844ee76bf2314bf1c22d25bad37589.tar.gz
Change total_time to total-time in MigrationStats
migration total_time was introduced in commit d5f8a5701d3690b5ec0c34b6a5c0b5a24d274540 for QEMU 1.2 Signed-off-by: Orit Wasserman <owasserm@redhat.com> Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
-rw-r--r--qapi-schema.json4
-rw-r--r--qmp-commands.hx9
2 files changed, 9 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index dd16dbd4c3..901cdf1255 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 e42b4e3138..d426e567c3 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2122,6 +2122,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)
@@ -2154,7 +2157,8 @@ Examples:
"ram":{
"transferred":123,
"remaining":123,
- "total":246
+ "total":246,
+ "total-time":12345
}
}
}
@@ -2168,7 +2172,8 @@ Examples:
"ram":{
"total":1057024,
"remaining":1053304,
- "transferred":3720
+ "transferred":3720,
+ "total-time":12345
},
"disk":{
"total":20971520,