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 /qapi-schema.json | |
| parent | b100fcfe4966aa41d4d6908d0c4c510bcf8f82dd (diff) | |
| parent | 7aa939af39e20eeca98fced59708a87c64267f54 (diff) | |
| download | qemu-86759aa89d1307d0dda2435cc25943bcd7026686.zip qemu-86759aa89d1307d0dda2435cc25943bcd7026686.tar.gz qemu-86759aa89d1307d0dda2435cc25943bcd7026686.tar.bz2 | |
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 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index 72b3c4d..bd8ad74 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -290,10 +290,6 @@ # # @total: total amount of bytes involved in the migration process # -# @total-time: total amount of ms since migration started. If -# migration has ended, it returns the total migration -# time. (since 1.2) -# # @duplicate: number of duplicate pages (since 1.2) # # @normal : number of normal pages (since 1.2) @@ -304,8 +300,7 @@ ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'total-time': 'int', 'duplicate': 'int', 'normal': 'int', - 'normal-bytes': 'int' } } + 'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int' } } ## # @XBZRLECacheStats @@ -350,12 +345,17 @@ # migration statistics, only returned if XBZRLE feature is on and # status is 'active' or 'completed' (since 1.2) # +# @total-time: #optional total amount of milliseconds since migration started. +# If migration has ended, it returns the total migration +# time. (since 1.2) +# # Since: 0.14.0 ## { 'type': 'MigrationInfo', 'data': {'*status': 'str', '*ram': 'MigrationStats', '*disk': 'MigrationStats', - '*xbzrle-cache': 'XBZRLECacheStats'} } + '*xbzrle-cache': 'XBZRLECacheStats', + '*total-time': 'int'} } ## # @query-migrate |