[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 62/72] qapi: Extract BlockdevOptions definition i
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH v1 62/72] qapi: Extract BlockdevOptions definition into qapi/block-core.json |
Date: |
Sat, 31 May 2014 13:51:41 +0200 |
Signed-off-by: Benoit Canet <address@hidden>
---
qapi-schema.json | 46 ----------------------------------------------
qapi/block-core.json | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/qapi-schema.json b/qapi-schema.json
index 9e7138e..53e546b 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3162,52 +3162,6 @@
'returns': ['RxFilterInfo'] }
##
-# @BlockdevOptions
-#
-# Options for creating a block device.
-#
-# Since: 1.7
-##
-{ 'union': 'BlockdevOptions',
- 'base': 'BlockdevOptionsBase',
- 'discriminator': 'driver',
- 'data': {
- 'file': 'BlockdevOptionsFile',
- 'host_device':'BlockdevOptionsFile',
- 'host_cdrom': 'BlockdevOptionsFile',
- 'host_floppy':'BlockdevOptionsFile',
- 'http': 'BlockdevOptionsFile',
- 'https': 'BlockdevOptionsFile',
- 'ftp': 'BlockdevOptionsFile',
- 'ftps': 'BlockdevOptionsFile',
- 'tftp': 'BlockdevOptionsFile',
-# TODO gluster: Wait for structured options
-# TODO iscsi: Wait for structured options
-# TODO nbd: Should take InetSocketAddress for 'host'?
-# TODO nfs: Wait for structured options
-# TODO rbd: Wait for structured options
-# TODO sheepdog: Wait for structured options
-# TODO ssh: Should take InetSocketAddress for 'host'?
- 'vvfat': 'BlockdevOptionsVVFAT',
- 'blkdebug': 'BlockdevOptionsBlkdebug',
- 'blkverify': 'BlockdevOptionsBlkverify',
- 'bochs': 'BlockdevOptionsGenericFormat',
- 'cloop': 'BlockdevOptionsGenericFormat',
- 'cow': 'BlockdevOptionsGenericCOWFormat',
- 'dmg': 'BlockdevOptionsGenericFormat',
- 'parallels': 'BlockdevOptionsGenericFormat',
- 'qcow': 'BlockdevOptionsGenericCOWFormat',
- 'qcow2': 'BlockdevOptionsQcow2',
- 'qed': 'BlockdevOptionsGenericCOWFormat',
- 'raw': 'BlockdevOptionsGenericFormat',
- 'vdi': 'BlockdevOptionsGenericFormat',
- 'vhdx': 'BlockdevOptionsGenericFormat',
- 'vmdk': 'BlockdevOptionsGenericCOWFormat',
- 'vpc': 'BlockdevOptionsGenericFormat',
- 'quorum': 'BlockdevOptionsQuorum'
- } }
-
-##
# @BlockdevRef
#
# Reference to a block device.
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 2373ef0..eb6f12b 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1372,3 +1372,49 @@
'children': [ 'BlockdevRef' ],
'vote-threshold': 'int', '*rewrite-corrupted': 'bool' } }
+##
+# @BlockdevOptions
+#
+# Options for creating a block device.
+#
+# Since: 1.7
+##
+{ 'union': 'BlockdevOptions',
+ 'base': 'BlockdevOptionsBase',
+ 'discriminator': 'driver',
+ 'data': {
+ 'file': 'BlockdevOptionsFile',
+ 'host_device':'BlockdevOptionsFile',
+ 'host_cdrom': 'BlockdevOptionsFile',
+ 'host_floppy':'BlockdevOptionsFile',
+ 'http': 'BlockdevOptionsFile',
+ 'https': 'BlockdevOptionsFile',
+ 'ftp': 'BlockdevOptionsFile',
+ 'ftps': 'BlockdevOptionsFile',
+ 'tftp': 'BlockdevOptionsFile',
+# TODO gluster: Wait for structured options
+# TODO iscsi: Wait for structured options
+# TODO nbd: Should take InetSocketAddress for 'host'?
+# TODO nfs: Wait for structured options
+# TODO rbd: Wait for structured options
+# TODO sheepdog: Wait for structured options
+# TODO ssh: Should take InetSocketAddress for 'host'?
+ 'vvfat': 'BlockdevOptionsVVFAT',
+ 'blkdebug': 'BlockdevOptionsBlkdebug',
+ 'blkverify': 'BlockdevOptionsBlkverify',
+ 'bochs': 'BlockdevOptionsGenericFormat',
+ 'cloop': 'BlockdevOptionsGenericFormat',
+ 'cow': 'BlockdevOptionsGenericCOWFormat',
+ 'dmg': 'BlockdevOptionsGenericFormat',
+ 'parallels': 'BlockdevOptionsGenericFormat',
+ 'qcow': 'BlockdevOptionsGenericCOWFormat',
+ 'qcow2': 'BlockdevOptionsQcow2',
+ 'qed': 'BlockdevOptionsGenericCOWFormat',
+ 'raw': 'BlockdevOptionsGenericFormat',
+ 'vdi': 'BlockdevOptionsGenericFormat',
+ 'vhdx': 'BlockdevOptionsGenericFormat',
+ 'vmdk': 'BlockdevOptionsGenericCOWFormat',
+ 'vpc': 'BlockdevOptionsGenericFormat',
+ 'quorum': 'BlockdevOptionsQuorum'
+ } }
+
--
1.9.1
- [Qemu-devel] [PATCH v1 53/72] qapi: Extract BlockdevOptionsGenericFormat definition into qapi/block-core.json, (continued)
- [Qemu-devel] [PATCH v1 53/72] qapi: Extract BlockdevOptionsGenericFormat definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 54/72] qapi: Extract BlockdevOptionsGenericCOWFormat definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 56/72] qapi: Extract BlkdebugEvent definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 55/72] qapi: Extract BlockdevOptionsQcow2 definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 57/72] qapi: Extract BlkdebugInjectErrorOptions definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 58/72] qapi: Extract BlkdebugSetStateOptions definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 64/72] qapi: Extract blockdev-add definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 60/72] qapi: Extract BlockdevOptionsBlkverify definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 61/72] qapi: Extract BlockdevOptionsQuorum definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 63/72] qapi: Extract BlockdevRef definition into qapi/block-core.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 62/72] qapi: Extract BlockdevOptions definition into qapi/block-core.json,
Benoît Canet <=
- [Qemu-devel] [PATCH v1 66/72] qapi: Extract BlockdevSnapshotInternal definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 65/72] qapi: Extract BiosAtaTranslation definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 67/72] qapi: Extract blockdev-snapshot-internal-sync definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 68/72] qapi: Extract blockdev-snapshot-delete-internal-sync definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 71/72] qapi: Extract nbd-server-add definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 70/72] qapi: Extract nbd-server-start definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 72/72] qapi: Extract nbd-server-stop definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 69/72] qapi: Extract eject definition into qapi/block.json, Benoît Canet, 2014/05/31
- [Qemu-devel] [PATCH v1 59/72] qapi: Extract BlockdevOptionsBlkdebug definition into qapi/block-core.json, Benoît Canet, 2014/05/31