aboutsummaryrefslogtreecommitdiff
path: root/qmp-commands.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-08-22 13:33:15 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-08-22 13:33:15 -0500
commit86759aa89d1307d0dda2435cc25943bcd7026686 (patch)
tree364644e9ddb68e73f3ce4eda3a9e56f591cb10e6 /qmp-commands.hx
parentb100fcfe4966aa41d4d6908d0c4c510bcf8f82dd (diff)
parent7aa939af39e20eeca98fced59708a87c64267f54 (diff)
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: migration: move total_time from ram stats to migration info monitor: avoid declaring unused variables qapi: Fix memory leak
Diffstat (limited to 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 00d798fe55..3745a21199 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -2239,14 +2239,14 @@ The main json-object contains the following:
- "status": migration status (json-string)
- Possible values: "active", "completed", "failed", "cancelled"
+- "total-time": total amount of ms since migration started. If
+ migration has ended, it returns the total migration
+ time (json-int)
- "ram": only present if "status" is "active", it is a json-object with the
following RAM information (in bytes):
- "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)