aboutsummaryrefslogtreecommitdiff
path: root/QMP
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2012-09-27 13:29:16 -0400
committerKevin Wolf <kwolf@redhat.com>2012-09-28 18:23:47 +0200
commited61fc10e8c8d2d1287f7edae92e44f5c97c540d (patch)
tree38fb80679cf86d52a87f035427b2e7cdfd5495fb /QMP
parent79fac5680d3680c9fb43d14a8d4e39ced25530f8 (diff)
downloadqemu-ed61fc10e8c8d2d1287f7edae92e44f5c97c540d.zip
qemu-ed61fc10e8c8d2d1287f7edae92e44f5c97c540d.tar.gz
qemu-ed61fc10e8c8d2d1287f7edae92e44f5c97c540d.tar.bz2
QAPI: add command for live block commit, 'block-commit'
The command for live block commit is added, which has the following arguments: device: the block device to perform the commit on (mandatory) base: the base image to commit into; optional (if not specified, it is the underlying original image) top: the top image of the commit - all data from inside top down to base will be committed into base (mandatory for now; see note, below) speed: maximum speed, in bytes/sec Note: Eventually this command will support merging down the active layer, but that code is not yet complete. If the active layer is passed in as top, then an error will be returned. Once merging down the active layer is supported, the 'top' argument may become optional, and default to the active layer. The is done as a block job, so upon completion a BLOCK_JOB_COMPLETED will be emitted. Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'QMP')
-rw-r--r--QMP/qmp-events.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt
index 2878058..4491020 100644
--- a/QMP/qmp-events.txt
+++ b/QMP/qmp-events.txt
@@ -50,7 +50,8 @@ Emitted when a block job has been cancelled.
Data:
-- "type": Job type ("stream" for image streaming, json-string)
+- "type": Job type (json-string; "stream" for image streaming
+ "commit" for block commit)
- "device": Device name (json-string)
- "len": Maximum progress value (json-int)
- "offset": Current progress value (json-int)
@@ -73,7 +74,8 @@ Emitted when a block job has completed.
Data:
-- "type": Job type ("stream" for image streaming, json-string)
+- "type": Job type (json-string; "stream" for image streaming
+ "commit" for block commit)
- "device": Device name (json-string)
- "len": Maximum progress value (json-int)
- "offset": Current progress value (json-int)