aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2014-06-30 15:14:15 +0200
committerStefan Hajnoczi <stefanha@redhat.com>2014-07-01 10:15:33 +0200
commit7676e2c597000eff3a7233b40cca768b358f9bc9 (patch)
treee02d1a413a6d4db0333f9dadd74ad2d9ac9aeea3 /qapi
parentc891e3bbc5bc3d74ad0ba896852a9796ceb147c2 (diff)
downloadqemu-7676e2c597000eff3a7233b40cca768b358f9bc9.zip
qemu-7676e2c597000eff3a7233b40cca768b358f9bc9.tar.gz
qemu-7676e2c597000eff3a7233b40cca768b358f9bc9.tar.bz2
block: make 'top' argument to block-commit optional
Now that active layer block-commit is supported, the 'top' argument no longer needs to be mandatory. Change it to optional, with the default being the active layer in the device chain. [kwolf: Rebased and resolved conflict in tests/qemu-iotests/040] Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Signed-off-by: Jeff Cody <jcody@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/block-core.json7
1 files changed, 4 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index faf394c..6a697f1 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -690,8 +690,9 @@
# @base: #optional The file name of the backing image to write data into.
# If not specified, this is the deepest backing image
#
-# @top: The file name of the backing image within the image chain,
-# which contains the topmost data to be committed down.
+# @top: #optional The file name of the backing image within the image chain,
+# which contains the topmost data to be committed down. If
+# not specified, this is the active layer.
#
# If top == base, that is an error.
# If top == active, the job will not be completed by itself,
@@ -719,7 +720,7 @@
#
##
{ 'command': 'block-commit',
- 'data': { 'device': 'str', '*base': 'str', 'top': 'str',
+ 'data': { 'device': 'str', '*base': 'str', '*top': 'str',
'*speed': 'int' } }
##