diff mbox

[v1,43/72] qapi: Extract block-job-complete definition into qapi/block-core.json

Message ID 1401537111-10221-44-git-send-email-benoit.canet@irqsave.net
State New
Headers show

Commit Message

BenoƮt Canet May 31, 2014, 11:51 a.m. UTC
Signed-off-by: Benoit Canet <benoit@irqsave.net>
---
 qapi-schema.json     | 26 --------------------------
 qapi/block-core.json | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index 3d4254c..2c625aa 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1621,32 +1621,6 @@ 
   'data': {'device': 'str', 'target': 'str', '*arg': 'str'} }
 
 ##
-# @block-job-complete:
-#
-# Manually trigger completion of an active background block operation.  This
-# is supported for drive mirroring, where it also switches the device to
-# write to the target path only.  The ability to complete is signaled with
-# a BLOCK_JOB_READY event.
-#
-# This command completes an active background block operation synchronously.
-# The ordering of this command's return with the BLOCK_JOB_COMPLETED event
-# is not defined.  Note that if an I/O error occurs during the processing of
-# this command: 1) the command itself will fail; 2) the error will be processed
-# according to the rerror/werror arguments that were specified when starting
-# the operation.
-#
-# A cancelled or paused job cannot be completed.
-#
-# @device: the device name
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.3
-##
-{ 'command': 'block-job-complete', 'data': { 'device': 'str' } }
-
-##
 # @drive-mirror-replace:
 #
 # Manually trigger completion of an active background drive-mirror operation
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 540b7ee..55aaf23 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -981,3 +981,29 @@ 
 ##
 { 'command': 'block-job-resume', 'data': { 'device': 'str' } }
 
+##
+# @block-job-complete:
+#
+# Manually trigger completion of an active background block operation.  This
+# is supported for drive mirroring, where it also switches the device to
+# write to the target path only.  The ability to complete is signaled with
+# a BLOCK_JOB_READY event.
+#
+# This command completes an active background block operation synchronously.
+# The ordering of this command's return with the BLOCK_JOB_COMPLETED event
+# is not defined.  Note that if an I/O error occurs during the processing of
+# this command: 1) the command itself will fail; 2) the error will be processed
+# according to the rerror/werror arguments that were specified when starting
+# the operation.
+#
+# A cancelled or paused job cannot be completed.
+#
+# @device: the device name
+#
+# Returns: Nothing on success
+#          If no background operation is active on this device, DeviceNotActive
+#
+# Since: 1.3
+##
+{ 'command': 'block-job-complete', 'data': { 'device': 'str' } }
+