diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-26 13:38:00 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-26 13:38:00 -0500 |
| commit | 18501ae6e825d8da72369fd091018ef71071bd87 (patch) | |
| tree | 780fd5af5f8a5bcb13da79962107b5364e7f29aa /qapi-schema.json | |
| parent | fad5593ca646010d3cb83f7926d78dd30c20c610 (diff) | |
| parent | 500f0061d628b52220038939728f0d7aee634468 (diff) | |
| download | qemu-18501ae6e825d8da72369fd091018ef71071bd87.tar.gz qemu-18501ae6e825d8da72369fd091018ef71071bd87.tar.bz2 qemu-18501ae6e825d8da72369fd091018ef71071bd87.zip | |
Merge remote-tracking branch 'quintela/migration.next' into staging
# By Peter Lieven (9) and others
# Via Juan Quintela
* quintela/migration.next: (22 commits)
Use qemu_put_buffer_async for guest memory pages
Add qemu_put_buffer_async
Use writev ops if available
Store the data to send also in iovec
Update bytes_xfer in qemu_put_byte
Add socket_writev_buffer function
Add QemuFileWritevBuffer QemuFileOps
migration: use XBZRLE only after bulk stage
migration: do not search dirty pages in bulk stage
migration: do not sent zero pages in bulk stage
migration: add an indicator for bulk state of ram migration
migration: search for zero instead of dup pages
bitops: unroll while loop in find_next_bit()
buffer_is_zero: use vector optimizations if possible
cutils: add a function to find non-zero content in a buffer
move vector definitions to qemu-common.h
savevm: Fix bugs in the VMSTATE_VBUFFER_MULTIPLY definition
savevm: Add VMSTATE_STRUCT_VARRAY_POINTER_UINT32
savevm: Add VMSTATE_FLOAT64 helpers
savevm: Add VMSTATE_UINTTL_EQUAL helper
...
Diffstat (limited to 'qapi-schema.json')
| -rw-r--r-- | qapi-schema.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qapi-schema.json b/qapi-schema.json index af499bd926..6494787714 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -496,7 +496,9 @@ # # @total: total amount of bytes involved in the migration process # -# @duplicate: number of duplicate pages (since 1.2) +# @duplicate: number of duplicate (zero) pages (since 1.2) +# +# @skipped: number of skipped zero pages (since 1.5) # # @normal : number of normal pages (since 1.2) # @@ -509,8 +511,8 @@ ## { 'type': 'MigrationStats', 'data': {'transferred': 'int', 'remaining': 'int', 'total': 'int' , - 'duplicate': 'int', 'normal': 'int', 'normal-bytes': 'int', - 'dirty-pages-rate' : 'int' } } + 'duplicate': 'int', 'skipped': 'int', 'normal': 'int', + 'normal-bytes': 'int', 'dirty-pages-rate' : 'int' } } ## # @XBZRLECacheStats |