david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block/qapi: Use separate options type for curl driver

Browse Source 
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: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Kevin Wolf 2016-09-08 13:08:20 +02:00
parent 0ffcdd9c06
commit 685552850b
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
qapi/block-core.json
View File

@ -1721,8 +1721,7 @@
## ##
# @BlockdevOptionsFile # @BlockdevOptionsFile
# #
# Driver specific block device options for the file backend and similar # Driver specific block device options for the file backend.
# protocols.
# #
# @filename: path to the image file # @filename: path to the image file
# #
@ -2210,6 +2209,18 @@
'data': { 'mode': 'ReplicationMode', 'data': { 'mode': 'ReplicationMode',
'*top-id': 'str' } } '*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 # @BlockdevOptions
# #
@ -2248,13 +2259,13 @@
'cloop': 'BlockdevOptionsGenericFormat', 'cloop': 'BlockdevOptionsGenericFormat',
'dmg': 'BlockdevOptionsGenericFormat', 'dmg': 'BlockdevOptionsGenericFormat',
'file': 'BlockdevOptionsFile', 'file': 'BlockdevOptionsFile',
'ftp': 'BlockdevOptionsFile', 'ftp': 'BlockdevOptionsCurl',
'ftps': 'BlockdevOptionsFile', 'ftps': 'BlockdevOptionsCurl',
'gluster': 'BlockdevOptionsGluster', 'gluster': 'BlockdevOptionsGluster',
'host_cdrom': 'BlockdevOptionsFile', 'host_cdrom': 'BlockdevOptionsFile',
'host_device':'BlockdevOptionsFile', 'host_device':'BlockdevOptionsFile',
'http': 'BlockdevOptionsFile', 'http': 'BlockdevOptionsCurl',
'https': 'BlockdevOptionsFile', 'https': 'BlockdevOptionsCurl',
# TODO iscsi: Wait for structured options # TODO iscsi: Wait for structured options
'luks': 'BlockdevOptionsLUKS', 'luks': 'BlockdevOptionsLUKS',
# TODO nbd: Should take InetSocketAddress for 'host'? # TODO nbd: Should take InetSocketAddress for 'host'?
@ -2271,7 +2282,7 @@
'replication':'BlockdevOptionsReplication', 'replication':'BlockdevOptionsReplication',
# TODO sheepdog: Wait for structured options # TODO sheepdog: Wait for structured options
# TODO ssh: Should take InetSocketAddress for 'host'? # TODO ssh: Should take InetSocketAddress for 'host'?
'tftp': 'BlockdevOptionsFile', 'tftp': 'BlockdevOptionsCurl',
'vdi': 'BlockdevOptionsGenericFormat', 'vdi': 'BlockdevOptionsGenericFormat',
'vhdx': 'BlockdevOptionsGenericFormat', 'vhdx': 'BlockdevOptionsGenericFormat',
'vmdk': 'BlockdevOptionsGenericCOWFormat', 'vmdk': 'BlockdevOptionsGenericCOWFormat',