diff mbox

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

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

Patch

diff --git a/qapi-schema.json b/qapi-schema.json
index 25c594a..9fe1cbc 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1002,29 +1002,6 @@ 
 { 'command': 'query-pci', 'returns': ['PciInfo'] }
 
 ##
-# @BlockdevOnError:
-#
-# An enumeration of possible behaviors for errors on I/O operations.
-# The exact meaning depends on whether the I/O was initiated by a guest
-# or by a block job
-#
-# @report: for guest operations, report the error to the guest;
-#          for jobs, cancel the job
-#
-# @ignore: ignore the error, only report a QMP event (BLOCK_IO_ERROR
-#          or BLOCK_JOB_ERROR)
-#
-# @enospc: same as @stop on ENOSPC, same as @report otherwise.
-#
-# @stop: for guest operations, stop the virtual machine;
-#        for jobs, pause the job
-#
-# Since: 1.3
-##
-{ 'enum': 'BlockdevOnError',
-  'data': ['report', 'ignore', 'enospc', 'stop'] }
-
-##
 # @MirrorSyncMode:
 #
 # An enumeration of possible behaviors for the initial synchronization
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 282154b..0f141d7 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -424,3 +424,26 @@ 
 ##
 { 'command': 'query-blockstats', 'returns': ['BlockStats'] }
 
+##
+# @BlockdevOnError:
+#
+# An enumeration of possible behaviors for errors on I/O operations.
+# The exact meaning depends on whether the I/O was initiated by a guest
+# or by a block job
+#
+# @report: for guest operations, report the error to the guest;
+#          for jobs, cancel the job
+#
+# @ignore: ignore the error, only report a QMP event (BLOCK_IO_ERROR
+#          or BLOCK_JOB_ERROR)
+#
+# @enospc: same as @stop on ENOSPC, same as @report otherwise.
+#
+# @stop: for guest operations, stop the virtual machine;
+#        for jobs, pause the job
+#
+# Since: 1.3
+##
+{ 'enum': 'BlockdevOnError',
+  'data': ['report', 'ignore', 'enospc', 'stop'] }
+