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

[Benoît Canet]

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

diff --git a/qapi-schema.json b/qapi-schema.json
index 3eb5a13..b046fd8 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3162,24 +3162,6 @@
   'returns': ['RxFilterInfo'] }
 
 ##
-# @BlockdevCacheOptions
-#
-# Includes cache-related options for block devices
-#
-# @writeback:   #optional enables writeback mode for any caches (default: true)
-# @direct:      #optional enables use of O_DIRECT (bypass the host page cache;
-#               default: false)
-# @no-flush:    #optional ignore any flush requests for the device (default:
-#               false)
-#
-# Since: 1.7
-##
-{ 'type': 'BlockdevCacheOptions',
-  'data': { '*writeback': 'bool',
-            '*direct': 'bool',
-            '*no-flush': 'bool' } }
-
-##
 # @BlockdevDriver
 #
 # Drivers that are supported in block device operations.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index f0b7bd2..104d876 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1082,3 +1082,21 @@
 { 'enum': 'BlockdevAioOptions',
   'data': [ 'threads', 'native' ] }
 
+##
+# @BlockdevCacheOptions
+#
+# Includes cache-related options for block devices
+#
+# @writeback:   #optional enables writeback mode for any caches (default: true)
+# @direct:      #optional enables use of O_DIRECT (bypass the host page cache;
+#               default: false)
+# @no-flush:    #optional ignore any flush requests for the device (default:
+#               false)
+#
+# Since: 1.7
+##
+{ 'type': 'BlockdevCacheOptions',
+  'data': { '*writeback': 'bool',
+            '*direct': 'bool',
+            '*no-flush': 'bool' } }
+
-- 
1.9.1