diff mbox

[v1,38/72] qapi: Extract block-stream definition into qapi/block-core.json

Message ID 1401537111-10221-39-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     | 38 --------------------------------------
 qapi/block-core.json | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 38 deletions(-)

Comments

Eric Blake June 2, 2014, 3:04 p.m. UTC | #1 
On 05/31/2014 05:51 AM, Benoît Canet wrote:
> Signed-off-by: Benoit Canet <benoit@irqsave.net>
> ---
>  qapi-schema.json     | 38 --------------------------------------
>  qapi/block-core.json | 38 ++++++++++++++++++++++++++++++++++++++
>  2 files changed, 38 insertions(+), 38 deletions(-)

21-38: Reviewed-by: Eric Blake <eblake@redhat.com>

I will point out that all this refactoring work will have conflicts with
other pending patches in the same area, such as Jeff's work on using
node-name in block-stream; but such conflicts should be obvious
resolutions (either series can go first, as long as the final result is
the improved command ending up in the new file).  I don't know which
series going in first would be more of a conflict magnet to the other
series.
diff mbox

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index 844784d..3c71c16 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1621,44 +1621,6 @@ 
   'data': {'device': 'str', 'target': 'str', '*arg': 'str'} }
 
 ##
-# @block-stream:
-#
-# Copy data from a backing file into a block device.
-#
-# The block streaming operation is performed in the background until the entire
-# backing file has been copied.  This command returns immediately once streaming
-# has started.  The status of ongoing block streaming operations can be checked
-# with query-block-jobs.  The operation can be stopped before it has completed
-# using the block-job-cancel command.
-#
-# If a base file is specified then sectors are not copied from that base file and
-# its backing chain.  When streaming completes the image file will have the base
-# file as its backing file.  This can be used to stream a subset of the backing
-# file chain instead of flattening the entire image.
-#
-# On successful completion the image file is updated to drop the backing file
-# and the BLOCK_JOB_COMPLETED event is emitted.
-#
-# @device: the device name
-#
-# @base:   #optional the common backing file name
-#
-# @speed:  #optional the maximum speed, in bytes per second
-#
-# @on-error: #optional the action to take on an error (default report).
-#            'stop' and 'enospc' can only be used if the block device
-#            supports io-status (see BlockInfo).  Since 1.3.
-#
-# Returns: Nothing on success
-#          If @device does not exist, DeviceNotFound
-#
-# Since: 1.1
-##
-{ 'command': 'block-stream',
-  'data': { 'device': 'str', '*base': 'str', '*speed': 'int',
-            '*on-error': 'BlockdevOnError' } }
-
-##
 # @block-job-set-speed:
 #
 # Set maximum speed for a background block operation.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 20515e6..a91f21a 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -848,3 +848,41 @@ 
             '*iops_rd_max': 'int', '*iops_wr_max': 'int',
             '*iops_size': 'int' } }
 
+##
+# @block-stream:
+#
+# Copy data from a backing file into a block device.
+#
+# The block streaming operation is performed in the background until the entire
+# backing file has been copied.  This command returns immediately once streaming
+# has started.  The status of ongoing block streaming operations can be checked
+# with query-block-jobs.  The operation can be stopped before it has completed
+# using the block-job-cancel command.
+#
+# If a base file is specified then sectors are not copied from that base file and
+# its backing chain.  When streaming completes the image file will have the base
+# file as its backing file.  This can be used to stream a subset of the backing
+# file chain instead of flattening the entire image.
+#
+# On successful completion the image file is updated to drop the backing file
+# and the BLOCK_JOB_COMPLETED event is emitted.
+#
+# @device: the device name
+#
+# @base:   #optional the common backing file name
+#
+# @speed:  #optional the maximum speed, in bytes per second
+#
+# @on-error: #optional the action to take on an error (default report).
+#            'stop' and 'enospc' can only be used if the block device
+#            supports io-status (see BlockInfo).  Since 1.3.
+#
+# Returns: Nothing on success
+#          If @device does not exist, DeviceNotFound
+#
+# Since: 1.1
+##
+{ 'command': 'block-stream',
+  'data': { 'device': 'str', '*base': 'str', '*speed': 'int',
+            '*on-error': 'BlockdevOnError' } }
+