[Qemu-devel] [PATCH v1 40/72] qapi: Extrat block-job-cancel definition into qapi/block-core.json

[Benoît Canet]

Signed-off-by: Benoit Canet <address@hidden>
---
 qapi-schema.json     | 30 ------------------------------
 qapi/block-core.json | 30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 307fc54..75d76f9 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1621,36 +1621,6 @@
   'data': {'device': 'str', 'target': 'str', '*arg': 'str'} }
 
 ##
-# @block-job-cancel:
-#
-# Stop an active background block operation.
-#
-# This command returns immediately after marking the active background block
-# operation for cancellation.  It is an error to call this command if no
-# operation is in progress.
-#
-# The operation will cancel as soon as possible and then emit the
-# BLOCK_JOB_CANCELLED event.  Before that happens the job is still visible when
-# enumerated using query-block-jobs.
-#
-# For streaming, the image file retains its backing file unless the streaming
-# operation happens to complete just as it is being cancelled.  A new streaming
-# operation can be started at a later time to finish copying all data from the
-# backing file.
-#
-# @device: the device name
-#
-# @force: #optional whether to allow cancellation of a paused job (default
-#         false).  Since 1.3.
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 1.1
-##
-{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } 
}
-
-##
 # @block-job-pause:
 #
 # Pause an active background block operation.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 48b2fc3..6a3de86 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -908,3 +908,33 @@
 { 'command': 'block-job-set-speed',
   'data': { 'device': 'str', 'speed': 'int' } }
 
+##
+# @block-job-cancel:
+#
+# Stop an active background block operation.
+#
+# This command returns immediately after marking the active background block
+# operation for cancellation.  It is an error to call this command if no
+# operation is in progress.
+#
+# The operation will cancel as soon as possible and then emit the
+# BLOCK_JOB_CANCELLED event.  Before that happens the job is still visible when
+# enumerated using query-block-jobs.
+#
+# For streaming, the image file retains its backing file unless the streaming
+# operation happens to complete just as it is being cancelled.  A new streaming
+# operation can be started at a later time to finish copying all data from the
+# backing file.
+#
+# @device: the device name
+#
+# @force: #optional whether to allow cancellation of a paused job (default
+#         false).  Since 1.3.
+#
+# Returns: Nothing on success
+#          If no background operation is active on this device, DeviceNotActive
+#
+# Since: 1.1
+##
+{ 'command': 'block-job-cancel', 'data': { 'device': 'str', '*force': 'bool' } 
}
+
-- 
1.9.1