Commit 6b02b1f0 authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

qapi: Allow blockdev-add for NBD 



Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent f84d431b

qapi/block-core.json

+23 −4
Original line number Diff line number Diff line
@@ -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' ] }



##
@@ -2219,6 +2220,24 @@ 
{ 'struct': 'BlockdevOptionsCurl',

  '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

#
@@ -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',