| Message ID | 20161025131141.24762-9-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10/25/2016 08:11 AM, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > 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 'replication' was also added in 2.8; we should mention it while touching this. > # > # 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' ] } Can we fix the TAB damage while at it? Reviewed-by: Eric Blake <eblake@redhat.com>
Am 26.10.2016 um 01:57 hat Eric Blake geschrieben: > On 10/25/2016 08:11 AM, Max Reitz wrote: > > Signed-off-by: Max Reitz <mreitz@redhat.com> > > --- > > 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 > > 'replication' was also added in 2.8; we should mention it while touching > this. In a patch separate from this series, please. Kevin
Am 25.10.2016 um 15:11 hat Max Reitz geschrieben: > Signed-off-by: Max Reitz <mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
On 26.10.2016 01:57, Eric Blake wrote: > On 10/25/2016 08:11 AM, Max Reitz wrote: >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> 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 > > 'replication' was also added in 2.8; we should mention it while touching > this. > >> # >> # 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' ] } > > Can we fix the TAB damage while at it? > > Reviewed-by: Eric Blake <eblake@redhat.com> You're completely right with both comments, but I think putting them in separate patches might be better (we even have time after soft freeze for this). If the maintainer applying this patch decides to put the tab fix into this patch while applying, I wouldn't mind, though. Max
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',
Signed-off-by: Max Reitz <mreitz@redhat.com> --- qapi/block-core.json | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)