[Qemu-devel] [PATCH v1 45/72] qapi: Extract BlockdevDiscardOptions definition into qapi/block-core.json

[Benoît Canet]

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

diff --git a/qapi-schema.json b/qapi-schema.json
index 5ae556c..6c29cb8 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3161,20 +3161,6 @@
 { 'command': 'query-rx-filter', 'data': { '*name': 'str' },
   'returns': ['RxFilterInfo'] }
 
-
-##
-# @BlockdevDiscardOptions
-#
-# Determines how to handle discard requests.
-#
-# @ignore:      Ignore the request
-# @unmap:       Forward as an unmap request
-#
-# Since: 1.7
-##
-{ 'enum': 'BlockdevDiscardOptions',
-  'data': [ 'ignore', 'unmap' ] }
-
 ##
 # @BlockdevDetectZeroesOptions
 #
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 1049a05..85cb470 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1040,3 +1040,16 @@
   'data': { 'device': 'str', 'target-reference': 'str',
             '*new-node-name': 'str' } }
 
+##
+# @BlockdevDiscardOptions
+#
+# Determines how to handle discard requests.
+#
+# @ignore:      Ignore the request
+# @unmap:       Forward as an unmap request
+#
+# Since: 1.7
+##
+{ 'enum': 'BlockdevDiscardOptions',
+  'data': [ 'ignore', 'unmap' ] }
+
-- 
1.9.1