Commit 68555285 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block/qapi: Use separate options type for curl driver 



We're going to add an option to the file drivers which doesn't apply to
the curl drivers, so give them a separate option type.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent 0ffcdd9c

qapi/block-core.json

+18 −7
Original line number Diff line number Diff line
@@ -1721,8 +1721,7 @@ 
##

# @BlockdevOptionsFile

#

# Driver specific block device options for the file backend and similar

# protocols.

# Driver specific block device options for the file backend.

#

# @filename:    path to the image file

#
@@ -2210,6 +2209,18 @@ 
  'data': { 'mode': 'ReplicationMode',

            '*top-id': 'str' } }



##

# @BlockdevOptionsCurl

#

# Driver specific block device options for the curl backend.

#

# @filename:    path to the image file

#

# Since: 1.7

##

{ 'struct': 'BlockdevOptionsCurl',

  'data': { 'filename': 'str' } }



##

# @BlockdevOptions

#
@@ -2248,13 +2259,13 @@ 
      'cloop':      'BlockdevOptionsGenericFormat',

      'dmg':        'BlockdevOptionsGenericFormat',

      'file':       'BlockdevOptionsFile',

      'ftp':        'BlockdevOptionsFile',

      'ftps':       'BlockdevOptionsFile',

      'ftp':        'BlockdevOptionsCurl',

      'ftps':       'BlockdevOptionsCurl',

      'gluster':    'BlockdevOptionsGluster',

      'host_cdrom': 'BlockdevOptionsFile',

      'host_device':'BlockdevOptionsFile',

      'http':       'BlockdevOptionsFile',

      'https':      'BlockdevOptionsFile',

      'http':       'BlockdevOptionsCurl',

      'https':      'BlockdevOptionsCurl',

# TODO iscsi: Wait for structured options

      'luks':       'BlockdevOptionsLUKS',

# TODO nbd: Should take InetSocketAddress for 'host'?
@@ -2271,7 +2282,7 @@ 
      'replication':'BlockdevOptionsReplication',

# TODO sheepdog: Wait for structured options

# TODO ssh: Should take InetSocketAddress for 'host'?

      'tftp':       'BlockdevOptionsFile',

      'tftp':       'BlockdevOptionsCurl',

      'vdi':        'BlockdevOptionsGenericFormat',

      'vhdx':       'BlockdevOptionsGenericFormat',

      'vmdk':       'BlockdevOptionsGenericCOWFormat',