diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:33:15 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-08-22 13:33:15 -0500 |
commit | 86759aa89d1307d0dda2435cc25943bcd7026686 (patch) | |
tree | 364644e9ddb68e73f3ce4eda3a9e56f591cb10e6 /qmp-commands.hx | |
parent | b100fcfe4966aa41d4d6908d0c4c510bcf8f82dd (diff) | |
parent | 7aa939af39e20eeca98fced59708a87c64267f54 (diff) | |
download | hqemu-86759aa89d1307d0dda2435cc25943bcd7026686.zip hqemu-86759aa89d1307d0dda2435cc25943bcd7026686.tar.gz |
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.hx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx index 00d798f..3745a21 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) |