[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD |
Date: |
Tue, 25 Oct 2016 15:11:36 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
qapi/block-core.json | 25 ++++++++++++++++++++++---
1 file changed, 22 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 97b1205..4b4a74c 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1703,14 +1703,15 @@
#
# @host_device, @host_cdrom: Since 2.1
# @gluster: Since 2.7
+# @nbd: Since 2.8
#
# Since: 2.0
##
{ 'enum': 'BlockdevDriver',
'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
- 'host_device', 'http', 'https', 'luks', 'null-aio', 'null-co',
- 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
+ 'host_device', 'http', 'https', 'luks', 'nbd', 'null-aio',
+ 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
'replication', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
##
@@ -2220,6 +2221,24 @@
'data': { 'filename': 'str' } }
##
+# @BlockdevOptionsNbd
+#
+# Driver specific block device options for NBD.
+#
+# @server: NBD server address
+#
+# @export: #optional export name
+#
+# @tls-creds: #optional TLS credentials ID
+#
+# Since: 2.8
+##
+{ 'struct': 'BlockdevOptionsNbd',
+ 'data': { 'server': 'SocketAddress',
+ '*export': 'str',
+ '*tls-creds': 'str' } }
+
+##
# @BlockdevOptions
#
# Options for creating a block device. Many options are available for all
@@ -2264,7 +2283,7 @@
'https': 'BlockdevOptionsCurl',
# TODO iscsi: Wait for structured options
'luks': 'BlockdevOptionsLUKS',
-# TODO nbd: Should take InetSocketAddress for 'host'?
+ 'nbd': 'BlockdevOptionsNbd',
# TODO nfs: Wait for structured options
'null-aio': 'BlockdevOptionsNull',
'null-co': 'BlockdevOptionsNull',
--
2.10.1
- [Qemu-devel] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 01/13] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 02/13] block/nbd: Reject port parameter without host, Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 04/13] block/nbd: Use qdict_put(), Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 05/13] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD,
Max Reitz <=
- [Qemu-devel] [PATCH v5 03/13] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 07/13] block/nbd: Use SocketAddress options, Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 11/13] socket_scm_helper: Accept fd directly, Max Reitz, 2016/10/25
- [Qemu-devel] [PATCH v5 09/13] iotests.py: Add qemu_nbd function, Max Reitz, 2016/10/25