[Qemu-devel] [PATCH v1 44/72] qapi: Extract drive-mirror-replace definition into qapi/block-core.json

[Benoît Canet]

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

diff --git a/qapi-schema.json b/qapi-schema.json
index 2c625aa..5ae556c 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1621,39 +1621,6 @@
   'data': {'device': 'str', 'target': 'str', '*arg': 'str'} }
 
 ##
-# @drive-mirror-replace:
-#
-# Manually trigger completion of an active background drive-mirror operation
-# and replace the target reference with the new mirror.
-# This 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 drive-mirror background operation
-# synchronously and replaces the target reference with the mirror.
-# 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 drive-mirror job cannot be completed.
-#
-# @device:           the device name
-# @target-reference: the id or node name of the block driver state to replace
-# @new-node-name:    #optional set the node-name of the new block driver state
-#                    needed if the target reference points to a regular node of
-#                    the graph
-#
-# Returns: Nothing on success
-#          If no background operation is active on this device, DeviceNotActive
-#
-# Since: 2.1
-##
-{ 'command': 'drive-mirror-replace',
-  'data': { 'device': 'str', 'target-reference': 'str',
-            '*new-node-name': 'str' } }
-
-##
 # @ObjectTypeInfo:
 #
 # This structure describes a search result from @qom-list-types
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 55aaf23..1049a05 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1007,3 +1007,36 @@
 ##
 { 'command': 'block-job-complete', 'data': { 'device': 'str' } }
 
+##
+# @drive-mirror-replace:
+#
+# Manually trigger completion of an active background drive-mirror operation
+# and replace the target reference with the new mirror.
+# This 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 drive-mirror background operation
+# synchronously and replaces the target reference with the mirror.
+# 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 drive-mirror job cannot be completed.
+#
+# @device:           the device name
+# @target-reference: the id or node name of the block driver state to replace
+# @new-node-name:    #optional set the node-name of the new block driver state
+#                    needed if the target reference points to a regular node of
+#                    the graph
+#
+# Returns: Nothing on success
+#          If no background operation is active on this device, DeviceNotActive
+#
+# Since: 2.1
+##
+{ 'command': 'drive-mirror-replace',
+  'data': { 'device': 'str', 'target-reference': 'str',
+            '*new-node-name': 'str' } }
+
-- 
1.9.1