From: Wenchao Xia <wenchaoqemu@gmail.com>
Date: Wed, 5 Mar 2014 02:44:38 +0000 (-0800)
Subject: qapi: convert BlockdevOptions to use enum discriminator
X-Git-Tag: qemu-xen-4.5.0-rc1~126^2~3
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=59ca664ef86c8a9078157336b566e832fc5466e2;p=qemu-upstream-4.5-testing.git

qapi: convert BlockdevOptions to use enum discriminator

After this patch, hidden enum type BlockdevOptionsKind will not
be generated, and other API can use enum BlockdevDriver.

Signed-off-by: Wenchao Xia <wenchaoqemu@gmail.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---

diff --git a/qapi-schema.json b/qapi-schema.json
index 6c381b730..f4f9439fe 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -4248,6 +4248,18 @@
             '*direct': 'bool',
             '*no-flush': 'bool' } }
 
+##
+# @BlockdevDriver
+#
+# Drivers that are supported in block device operations.
+#
+# Since: 2.0
+##
+{ 'enum': 'BlockdevDriver',
+  'data': [ 'file', 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug',
+            'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow',
+            'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] }
+
 ##
 # @BlockdevOptionsBase
 #
@@ -4272,7 +4284,7 @@
 # Since: 1.7
 ##
 { 'type': 'BlockdevOptionsBase',
-  'data': { 'driver': 'str',
+  'data': { 'driver': 'BlockdevDriver',
             '*id': 'str',
             '*node-name': 'str',
             '*discard': 'BlockdevDiscardOptions',