Message ID | 1410318528-24433-4-git-send-email-famz@redhat.com |
---|---|
State | New |
Headers | show |
The Wednesday 10 Sep 2014 à 11:08:48 (+0800), Fam Zheng wrote : > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > qapi/block-core.json | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 35191b4..5adef27 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -1483,41 +1483,41 @@ > 'discriminator': 'driver', > 'data': { > 'archipelago':'BlockdevOptionsArchipelago', > + 'blkdebug': 'BlockdevOptionsBlkdebug', > + 'blkverify': 'BlockdevOptionsBlkverify', > + 'bochs': 'BlockdevOptionsGenericFormat', > + 'cloop': 'BlockdevOptionsGenericFormat', > + 'cow': 'BlockdevOptionsGenericCOWFormat', > + 'dmg': 'BlockdevOptionsGenericFormat', > 'file': 'BlockdevOptionsFile', > - 'host_device':'BlockdevOptionsFile', > + 'ftp': 'BlockdevOptionsFile', > + 'ftps': 'BlockdevOptionsFile', > +# TODO gluster: Wait for structured options > 'host_cdrom': 'BlockdevOptionsFile', > + 'host_device':'BlockdevOptionsFile', > 'host_floppy':'BlockdevOptionsFile', > 'http': 'BlockdevOptionsFile', > 'https': 'BlockdevOptionsFile', > - 'ftp': 'BlockdevOptionsFile', > - 'ftps': 'BlockdevOptionsFile', > - 'tftp': 'BlockdevOptionsFile', > -# TODO gluster: Wait for structured options > # TODO iscsi: Wait for structured options > # TODO nbd: Should take InetSocketAddress for 'host'? > # TODO nfs: Wait for structured options Do we want to move all the TODO sorted alphabetically at the same place ? Or do be want to put the TODOS sorted alphabetically near their respective option declaration ? > -# TODO rbd: Wait for structured options > -# TODO sheepdog: Wait for structured options > -# TODO ssh: Should take InetSocketAddress for 'host'? > - 'vvfat': 'BlockdevOptionsVVFAT', > - 'blkdebug': 'BlockdevOptionsBlkdebug', > - 'blkverify': 'BlockdevOptionsBlkverify', > - 'bochs': 'BlockdevOptionsGenericFormat', > - 'cloop': 'BlockdevOptionsGenericFormat', > - 'cow': 'BlockdevOptionsGenericCOWFormat', > - 'dmg': 'BlockdevOptionsGenericFormat', > + 'null-aio': 'BlockdevOptionsNull', > + 'null-co': 'BlockdevOptionsNull', > 'parallels': 'BlockdevOptionsGenericFormat', > - 'qcow': 'BlockdevOptionsGenericCOWFormat', > 'qcow2': 'BlockdevOptionsQcow2', > + 'qcow': 'BlockdevOptionsGenericCOWFormat', > 'qed': 'BlockdevOptionsGenericCOWFormat', > + 'quorum': 'BlockdevOptionsQuorum', > 'raw': 'BlockdevOptionsGenericFormat', > +# TODO rbd: Wait for structured options > +# TODO sheepdog: Wait for structured options > +# TODO ssh: Should take InetSocketAddress for 'host'? > + 'tftp': 'BlockdevOptionsFile', > 'vdi': 'BlockdevOptionsGenericFormat', > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > 'vpc': 'BlockdevOptionsGenericFormat', > - 'quorum': 'BlockdevOptionsQuorum', > - 'null-aio': 'BlockdevOptionsNull', > - 'null-co': 'BlockdevOptionsNull' > + 'vvfat': 'BlockdevOptionsVVFAT' > } } > > ## > -- > 1.9.3 > >
On Wed, 09/10 15:32, Benoît Canet wrote: > The Wednesday 10 Sep 2014 à 11:08:48 (+0800), Fam Zheng wrote : > > Signed-off-by: Fam Zheng <famz@redhat.com> > > --- > > qapi/block-core.json | 38 +++++++++++++++++++------------------- > > 1 file changed, 19 insertions(+), 19 deletions(-) > > > > diff --git a/qapi/block-core.json b/qapi/block-core.json > > index 35191b4..5adef27 100644 > > --- a/qapi/block-core.json > > +++ b/qapi/block-core.json > > @@ -1483,41 +1483,41 @@ > > 'discriminator': 'driver', > > 'data': { > > 'archipelago':'BlockdevOptionsArchipelago', > > + 'blkdebug': 'BlockdevOptionsBlkdebug', > > + 'blkverify': 'BlockdevOptionsBlkverify', > > + 'bochs': 'BlockdevOptionsGenericFormat', > > + 'cloop': 'BlockdevOptionsGenericFormat', > > + 'cow': 'BlockdevOptionsGenericCOWFormat', > > + 'dmg': 'BlockdevOptionsGenericFormat', > > 'file': 'BlockdevOptionsFile', > > - 'host_device':'BlockdevOptionsFile', > > + 'ftp': 'BlockdevOptionsFile', > > + 'ftps': 'BlockdevOptionsFile', > > +# TODO gluster: Wait for structured options > > 'host_cdrom': 'BlockdevOptionsFile', > > + 'host_device':'BlockdevOptionsFile', > > 'host_floppy':'BlockdevOptionsFile', > > 'http': 'BlockdevOptionsFile', > > 'https': 'BlockdevOptionsFile', > > - 'ftp': 'BlockdevOptionsFile', > > - 'ftps': 'BlockdevOptionsFile', > > - 'tftp': 'BlockdevOptionsFile', > > -# TODO gluster: Wait for structured options > > # TODO iscsi: Wait for structured options > > # TODO nbd: Should take InetSocketAddress for 'host'? > > # TODO nfs: Wait for structured options > > Do we want to move all the TODO sorted alphabetically at the same place ? > Or do be want to put the TODOS sorted alphabetically near their respective > option declaration ? I intended to sort by the actual driver name so in the futuer patch, it will be a one liner replace, instead of a remove in the far TODO list and a insert in their right position. Fam
diff --git a/qapi/block-core.json b/qapi/block-core.json index 35191b4..5adef27 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1483,41 +1483,41 @@ 'discriminator': 'driver', 'data': { 'archipelago':'BlockdevOptionsArchipelago', + 'blkdebug': 'BlockdevOptionsBlkdebug', + 'blkverify': 'BlockdevOptionsBlkverify', + 'bochs': 'BlockdevOptionsGenericFormat', + 'cloop': 'BlockdevOptionsGenericFormat', + 'cow': 'BlockdevOptionsGenericCOWFormat', + 'dmg': 'BlockdevOptionsGenericFormat', 'file': 'BlockdevOptionsFile', - 'host_device':'BlockdevOptionsFile', + 'ftp': 'BlockdevOptionsFile', + 'ftps': 'BlockdevOptionsFile', +# TODO gluster: Wait for structured options 'host_cdrom': 'BlockdevOptionsFile', + 'host_device':'BlockdevOptionsFile', 'host_floppy':'BlockdevOptionsFile', 'http': 'BlockdevOptionsFile', 'https': 'BlockdevOptionsFile', - 'ftp': 'BlockdevOptionsFile', - 'ftps': 'BlockdevOptionsFile', - 'tftp': 'BlockdevOptionsFile', -# TODO gluster: Wait for structured options # TODO iscsi: Wait for structured options # TODO nbd: Should take InetSocketAddress for 'host'? # TODO nfs: Wait for structured options -# TODO rbd: Wait for structured options -# TODO sheepdog: Wait for structured options -# TODO ssh: Should take InetSocketAddress for 'host'? - 'vvfat': 'BlockdevOptionsVVFAT', - 'blkdebug': 'BlockdevOptionsBlkdebug', - 'blkverify': 'BlockdevOptionsBlkverify', - 'bochs': 'BlockdevOptionsGenericFormat', - 'cloop': 'BlockdevOptionsGenericFormat', - 'cow': 'BlockdevOptionsGenericCOWFormat', - 'dmg': 'BlockdevOptionsGenericFormat', + 'null-aio': 'BlockdevOptionsNull', + 'null-co': 'BlockdevOptionsNull', 'parallels': 'BlockdevOptionsGenericFormat', - 'qcow': 'BlockdevOptionsGenericCOWFormat', 'qcow2': 'BlockdevOptionsQcow2', + 'qcow': 'BlockdevOptionsGenericCOWFormat', 'qed': 'BlockdevOptionsGenericCOWFormat', + 'quorum': 'BlockdevOptionsQuorum', 'raw': 'BlockdevOptionsGenericFormat', +# TODO rbd: Wait for structured options +# TODO sheepdog: Wait for structured options +# TODO ssh: Should take InetSocketAddress for 'host'? + 'tftp': 'BlockdevOptionsFile', 'vdi': 'BlockdevOptionsGenericFormat', 'vhdx': 'BlockdevOptionsGenericFormat', 'vmdk': 'BlockdevOptionsGenericCOWFormat', 'vpc': 'BlockdevOptionsGenericFormat', - 'quorum': 'BlockdevOptionsQuorum', - 'null-aio': 'BlockdevOptionsNull', - 'null-co': 'BlockdevOptionsNull' + 'vvfat': 'BlockdevOptionsVVFAT' } } ##
Signed-off-by: Fam Zheng <famz@redhat.com> --- qapi/block-core.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)