[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/29] qapi: allow blockdev-add for ssh
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 05/29] qapi: allow blockdev-add for ssh |
Date: |
Mon, 31 Oct 2016 18:25:34 +0100 |
From: Ashijeet Acharya <address@hidden>
Introduce new object 'BlockdevOptionsSsh' in qapi/block-core.json to
support blockdev-add for SSH network protocol driver. Use only 'struct
InetSocketAddress' since SSH only supports connection over TCP.
Signed-off-by: Ashijeet Acharya <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
[ kwolf: Removed host_key_check option, we want to expose this later in
a structured way rather than as a string that must be parsed ]
Signed-off-by: Kevin Wolf <address@hidden>
---
qapi/block-core.json | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index cd1fa7b..0f2b703 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1703,7 +1703,7 @@
#
# @host_device, @host_cdrom: Since 2.1
# @gluster: Since 2.7
-# @nbd: Since 2.8
+# @nbd, @ssh: Since 2.8
#
# Since: 2.0
##
@@ -1712,7 +1712,8 @@
'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
'host_device', 'http', 'https', 'luks', 'nbd', 'null-aio',
'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
- 'replication', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
+ 'replication', 'ssh', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc',
+ 'vvfat' ] }
##
# @BlockdevOptionsFile
@@ -1949,6 +1950,25 @@
'*vport': 'int',
'*segment': 'str' } }
+##
+# @BlockdevOptionsSsh
+#
+# @server: host address
+#
+# @path: path to the image on the host
+#
+# @user: #optional user as which to connect, defaults to current
+# local user name
+#
+# TODO: Expose the host_key_check option in QMP
+#
+# Since 2.8
+##
+{ 'struct': 'BlockdevOptionsSsh',
+ 'data': { 'server': 'InetSocketAddress',
+ 'path': 'str',
+ '*user': 'str' } }
+
##
# @BlkdebugEvent
@@ -2296,7 +2316,7 @@
# TODO rbd: Wait for structured options
'replication':'BlockdevOptionsReplication',
# TODO sheepdog: Wait for structured options
-# TODO ssh: Should take InetSocketAddress for 'host'?
+ 'ssh': 'BlockdevOptionsSsh',
'tftp': 'BlockdevOptionsCurl',
'vdi': 'BlockdevOptionsGenericFormat',
'vhdx': 'BlockdevOptionsGenericFormat',
--
1.8.3.1
- [Qemu-devel] [PULL 00/29] Block layer patches, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 04/29] block/ssh: Use InetSocketAddress options, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 05/29] qapi: allow blockdev-add for ssh,
Kevin Wolf <=
- [Qemu-devel] [PULL 06/29] block: Add bdrv_drain_all_{begin,end}(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 02/29] util/qemu-sockets: Make inet_connect_saddr() public, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 01/29] block/ssh: Add ssh_has_filename_options_conflict(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 07/29] block: Pause all jobs during bdrv_reopen_multiple(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 08/29] block: Add block_job_add_bdrv(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 09/29] block: Use block_job_add_bdrv() in mirror_start_job(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 10/29] block: Use block_job_add_bdrv() in backup_start(), Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 03/29] block/ssh: Add InetSocketAddress and accept it, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 11/29] block: Check blockers in all nodes involved in a block-commit job, Kevin Wolf, 2016/10/31
- [Qemu-devel] [PULL 14/29] block: Support streaming to an intermediate layer, Kevin Wolf, 2016/10/31