On Wed, Nov 02, 2016 at 06:55:38PM +0100, Max Reitz wrote: > A follow-up patch will remove the curl block driver's TFTP support, so > remove the protocol from the QAPI schema. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > docs/qmp-commands.txt | 2 +- > qapi/block-core.json | 7 +++---- > 2 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt > index 6afa872..abf210a 100644 > --- a/docs/qmp-commands.txt > +++ b/docs/qmp-commands.txt > @@ -1803,7 +1803,7 @@ Each json-object contain the following: > "file", "file", "ftp", "ftps", "host_cdrom", > "host_device", "http", "https", > "nbd", "parallels", "qcow", "qcow2", "raw", > - "tftp", "vdi", "vmdk", "vpc", "vvfat" > + "vdi", "vmdk", "vpc", "vvfat" > - "backing_file": backing file name (json-string, optional) > - "backing_file_depth": number of files in the backing file chain > (json-int) > - "encrypted": true if encrypted, false otherwise (json-bool) > diff --git a/qapi/block-core.json b/qapi/block-core.json > index bcd3b9e..c29bef7 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -243,12 +243,12 @@ > # 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', > # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', > # 'http', 'https', 'luks', 'nbd', 'parallels', 'qcow', > -# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' > +# 'qcow2', 'raw', 'vdi', 'vmdk', 'vpc', 'vvfat' > # 2.2: 'archipelago' added, 'cow' dropped > # 2.3: 'host_floppy' deprecated > # 2.5: 'host_floppy' dropped > # 2.6: 'luks' added > -# 2.8: 'replication' added > +# 2.8: 'replication' added, 'tftp' dropped > # > # @backing_file: #optional the name of the backing file (for copy-on-write) > # > @@ -1723,7 +1723,7 @@ > 'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom', > 'host_device', 'http', 'https', 'luks', 'nbd', 'nfs', 'null-aio', > 'null-co', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', > - 'replication', 'ssh', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', > + 'replication', 'ssh', 'vdi', 'vhdx', 'vmdk', 'vpc', > 'vvfat' ] } > > ## > @@ -2410,7 +2410,6 @@ > 'replication':'BlockdevOptionsReplication', > # TODO sheepdog: Wait for structured options > 'ssh': 'BlockdevOptionsSsh', > - 'tftp': 'BlockdevOptionsCurl', > 'vdi': 'BlockdevOptionsGenericFormat', > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > -- > 2.10.2 >
Reviewed-by: Jeff Cody <jc...@redhat.com>
