| Message ID | 1401881404-15823-4-git-send-email-cnanakos@grnet.gr |
|---|---|
| State | New |
| Headers | show |
Am 04.06.2014 um 13:30 hat Chrysostomos Nanakos geschrieben: > Introduce new enum BlockdevOptionsArchipelago. > > @volume: #Name of the Archipelago volume image > > @mport: #'mport' is the port number on which mapperd is > listening. This is optional and if not specified, > QEMU will make Archipelago to use the default port. > > @vport: #'vport' is the port number on which vlmcd is > listening. This is optional and if not specified, > QEMU will make Archipelago to use the default port. > > Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> > --- > qapi-schema.json | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 7bc33ea..eef4a11 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -931,7 +931,7 @@ > # 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', > # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', > # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow', > -# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' > +# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat', 'archipelago' > # > # @backing_file: #optional the name of the backing file (for copy-on-write) > # > @@ -4317,7 +4317,8 @@ > 'data': [ 'file', 'host_device', 'host_cdrom', 'host_floppy', > 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug', > 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow', > - 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] } > + 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum', > + 'archipelago' ] } > > ## > # @BlockdevOptionsBase > @@ -4444,6 +4445,31 @@ > '*pass-discard-snapshot': 'bool', > '*pass-discard-other': 'bool' } } > > + > +## > +# @BlockdevOptionsArchipelago > +# > +# Driver specific block device options for Archipelago. > +# > +# @volume: #Name of the Archipelago volume image > +# > +# > +# @mport: #'mport' is the port number on which mapperd is > +# listening. This is optional > +# and if not specified, QEMU will make Archipelago to > +# use the default port. > +# > +# @vport: #'vport' is the port number on which vlmcd is > +# listening. This is optional > +# and if not specified, QEMU will make Archipelago to > +# use the default port. > +# Since: 2.0 Not really. :-) If you fix this to say "2.1", you can add my Reviewed-by to this patch. > +## > +{ 'type': 'BlockdevOptionsArchipelago', > + 'data': { 'volume': 'str', > + '*mport': 'int', > + '*vport': 'int' } } > + > ## > # @BlkdebugEvent > # > @@ -4616,6 +4642,7 @@ > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > 'vpc': 'BlockdevOptionsGenericFormat', > + 'archipelago': 'BlockdevOptionsArchipelago', > 'quorum': 'BlockdevOptionsQuorum' > } } I believe this list was once sorted alphabetically, once for protocols and then for image formats. archipelago would then go to the very top. Kevin
On 06/04/2014 02:38 PM, Kevin Wolf wrote: > Am 04.06.2014 um 13:30 hat Chrysostomos Nanakos geschrieben: >> Introduce new enum BlockdevOptionsArchipelago. >> >> @volume: #Name of the Archipelago volume image >> >> @mport: #'mport' is the port number on which mapperd is >> listening. This is optional and if not specified, >> QEMU will make Archipelago to use the default port. >> >> @vport: #'vport' is the port number on which vlmcd is >> listening. This is optional and if not specified, >> QEMU will make Archipelago to use the default port. >> >> Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> >> --- >> qapi-schema.json | 31 +++++++++++++++++++++++++++++-- >> 1 file changed, 29 insertions(+), 2 deletions(-) >> >> diff --git a/qapi-schema.json b/qapi-schema.json >> index 7bc33ea..eef4a11 100644 >> --- a/qapi-schema.json >> +++ b/qapi-schema.json >> @@ -931,7 +931,7 @@ >> # 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', >> # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', >> # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow', >> -# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' >> +# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat', 'archipelago' >> # >> # @backing_file: #optional the name of the backing file (for copy-on-write) >> # >> @@ -4317,7 +4317,8 @@ >> 'data': [ 'file', 'host_device', 'host_cdrom', 'host_floppy', >> 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug', >> 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow', >> - 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] } >> + 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum', >> + 'archipelago' ] } >> >> ## >> # @BlockdevOptionsBase >> @@ -4444,6 +4445,31 @@ >> '*pass-discard-snapshot': 'bool', >> '*pass-discard-other': 'bool' } } >> >> + >> +## >> +# @BlockdevOptionsArchipelago >> +# >> +# Driver specific block device options for Archipelago. >> +# >> +# @volume: #Name of the Archipelago volume image >> +# >> +# >> +# @mport: #'mport' is the port number on which mapperd is >> +# listening. This is optional >> +# and if not specified, QEMU will make Archipelago to >> +# use the default port. >> +# >> +# @vport: #'vport' is the port number on which vlmcd is >> +# listening. This is optional >> +# and if not specified, QEMU will make Archipelago to >> +# use the default port. >> +# Since: 2.0 > Not really. :-) > > If you fix this to say "2.1", you can add my Reviewed-by to this patch. Fixed for v4 series. > >> +## >> +{ 'type': 'BlockdevOptionsArchipelago', >> + 'data': { 'volume': 'str', >> + '*mport': 'int', >> + '*vport': 'int' } } >> + >> ## >> # @BlkdebugEvent >> # >> @@ -4616,6 +4642,7 @@ >> 'vhdx': 'BlockdevOptionsGenericFormat', >> 'vmdk': 'BlockdevOptionsGenericCOWFormat', >> 'vpc': 'BlockdevOptionsGenericFormat', >> + 'archipelago': 'BlockdevOptionsArchipelago', >> 'quorum': 'BlockdevOptionsQuorum' >> } } > I believe this list was once sorted alphabetically, once for protocols > and then for image formats. archipelago would then go to the very top. > > Kevin Fixed also for v4 series.
On 06/04/2014 05:30 AM, Chrysostomos Nanakos wrote: > Introduce new enum BlockdevOptionsArchipelago. > > @volume: #Name of the Archipelago volume image > > @mport: #'mport' is the port number on which mapperd is > listening. This is optional and if not specified, > QEMU will make Archipelago to use the default port. > > @vport: #'vport' is the port number on which vlmcd is > listening. This is optional and if not specified, > QEMU will make Archipelago to use the default port. > > Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> > --- > qapi-schema.json | 31 +++++++++++++++++++++++++++++-- > 1 file changed, 29 insertions(+), 2 deletions(-) > > + > +## > +# @BlockdevOptionsArchipelago > +# > +# Driver specific block device options for Archipelago. > +# > +# @volume: #Name of the Archipelago volume image > +# s/#Name/Name/ (we only use # for the initial comment, and for the special marking '#optional' that designates when a parameter is optional) > +# > +# @mport: #'mport' is the port number on which mapperd is > +# listening. This is optional > +# and if not specified, QEMU will make Archipelago to > +# use the default port. @mport: #optional The port number ... s/to use/use/ > +# > +# @vport: #'vport' is the port number on which vlmcd is > +# listening. This is optional > +# and if not specified, QEMU will make Archipelago to > +# use the default port. @vport: #optional The port number... s/to use/use/ > +# Since: 2.0 2.1 > +## > +{ 'type': 'BlockdevOptionsArchipelago', > + 'data': { 'volume': 'str', > + '*mport': 'int', > + '*vport': 'int' } } > + > ## > # @BlkdebugEvent > # > @@ -4616,6 +4642,7 @@ > 'vhdx': 'BlockdevOptionsGenericFormat', > 'vmdk': 'BlockdevOptionsGenericCOWFormat', > 'vpc': 'BlockdevOptionsGenericFormat', > + 'archipelago': 'BlockdevOptionsArchipelago', > 'quorum': 'BlockdevOptionsQuorum' > } } > >
On 06/04/2014 03:56 PM, Eric Blake wrote: > On 06/04/2014 05:30 AM, Chrysostomos Nanakos wrote: >> Introduce new enum BlockdevOptionsArchipelago. >> >> @volume: #Name of the Archipelago volume image >> >> @mport: #'mport' is the port number on which mapperd is >> listening. This is optional and if not specified, >> QEMU will make Archipelago to use the default port. >> >> @vport: #'vport' is the port number on which vlmcd is >> listening. This is optional and if not specified, >> QEMU will make Archipelago to use the default port. >> >> Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> >> --- >> qapi-schema.json | 31 +++++++++++++++++++++++++++++-- >> 1 file changed, 29 insertions(+), 2 deletions(-) >> >> + >> +## >> +# @BlockdevOptionsArchipelago >> +# >> +# Driver specific block device options for Archipelago. >> +# >> +# @volume: #Name of the Archipelago volume image >> +# > s/#Name/Name/ (we only use # for the initial comment, and for the > special marking '#optional' that designates when a parameter is optional) > >> +# >> +# @mport: #'mport' is the port number on which mapperd is >> +# listening. This is optional >> +# and if not specified, QEMU will make Archipelago to >> +# use the default port. > @mport: #optional The port number ... > > s/to use/use/ > > >> +# >> +# @vport: #'vport' is the port number on which vlmcd is >> +# listening. This is optional >> +# and if not specified, QEMU will make Archipelago to >> +# use the default port. > @vport: #optional The port number... > > s/to use/use/ > >> +# Since: 2.0 > 2.1 > >> +## >> +{ 'type': 'BlockdevOptionsArchipelago', >> + 'data': { 'volume': 'str', >> + '*mport': 'int', >> + '*vport': 'int' } } >> + >> ## >> # @BlkdebugEvent >> # >> @@ -4616,6 +4642,7 @@ >> 'vhdx': 'BlockdevOptionsGenericFormat', >> 'vmdk': 'BlockdevOptionsGenericCOWFormat', >> 'vpc': 'BlockdevOptionsGenericFormat', >> + 'archipelago': 'BlockdevOptionsArchipelago', >> 'quorum': 'BlockdevOptionsQuorum' >> } } >> >> Fixed everything for v4 series. Thanks!
diff --git a/qapi-schema.json b/qapi-schema.json index 7bc33ea..eef4a11 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -931,7 +931,7 @@ # 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg', # 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow', -# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' +# 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat', 'archipelago' # # @backing_file: #optional the name of the backing file (for copy-on-write) # @@ -4317,7 +4317,8 @@ 'data': [ 'file', 'host_device', 'host_cdrom', 'host_floppy', 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug', 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow', - 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] } + 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum', + 'archipelago' ] } ## # @BlockdevOptionsBase @@ -4444,6 +4445,31 @@ '*pass-discard-snapshot': 'bool', '*pass-discard-other': 'bool' } } + +## +# @BlockdevOptionsArchipelago +# +# Driver specific block device options for Archipelago. +# +# @volume: #Name of the Archipelago volume image +# +# +# @mport: #'mport' is the port number on which mapperd is +# listening. This is optional +# and if not specified, QEMU will make Archipelago to +# use the default port. +# +# @vport: #'vport' is the port number on which vlmcd is +# listening. This is optional +# and if not specified, QEMU will make Archipelago to +# use the default port. +# Since: 2.0 +## +{ 'type': 'BlockdevOptionsArchipelago', + 'data': { 'volume': 'str', + '*mport': 'int', + '*vport': 'int' } } + ## # @BlkdebugEvent # @@ -4616,6 +4642,7 @@ 'vhdx': 'BlockdevOptionsGenericFormat', 'vmdk': 'BlockdevOptionsGenericCOWFormat', 'vpc': 'BlockdevOptionsGenericFormat', + 'archipelago': 'BlockdevOptionsArchipelago', 'quorum': 'BlockdevOptionsQuorum' } }
Introduce new enum BlockdevOptionsArchipelago. @volume: #Name of the Archipelago volume image @mport: #'mport' is the port number on which mapperd is listening. This is optional and if not specified, QEMU will make Archipelago to use the default port. @vport: #'vport' is the port number on which vlmcd is listening. This is optional and if not specified, QEMU will make Archipelago to use the default port. Signed-off-by: Chrysostomos Nanakos <cnanakos@grnet.gr> --- qapi-schema.json | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-)