On 22.07.2016 12:16, Wang WeiWei wrote: > From: Wen Congyang <we...@cn.fujitsu.com> > > Signed-off-by: Wen Congyang <we...@cn.fujitsu.com> > Signed-off-by: zhanghailiang <zhang.zhanghaili...@huawei.com> > Signed-off-by: Gonglei <arei.gong...@huawei.com> > Signed-off-by: Changlong Xie <xiecl.f...@cn.fujitsu.com> > Reviewed-by: Eric Blake <ebl...@redhat.com> > Signed-off-by: Wang WeiWei <wangww.f...@cn.fujitsu.com> > --- > qapi/block-core.json | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 7f05b68..59565e9 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -248,6 +248,7 @@ > # 2.3: 'host_floppy' deprecated > # 2.5: 'host_floppy' dropped > # 2.6: 'luks' added > +# 2.7: 'replication' added
Probably 2.8
> #
> # @backing_file: #optional the name of the backing file (for copy-on-write)
> #
> @@ -1696,8 +1697,8 @@
> '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', 'tftp',
> - 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
> + 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
> 'replication',
> + 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
>
> ##
> # @BlockdevOptionsFile
> @@ -2160,6 +2161,19 @@
> { 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] }
>
> ##
> +# @BlockdevOptionsReplication
> +#
> +# Driver specific block device options for replication
> +#
> +# @mode: the replication mode
What about top-id?
> +#
> +# Since: 2.7
2.8
Max
> +##
> +{ 'struct': 'BlockdevOptionsReplication',
> + 'base': 'BlockdevOptionsGenericFormat',
> + 'data': { 'mode': 'ReplicationMode' } }
> +
> +##
> # @BlockdevOptions
> #
> # Options for creating a block device. Many options are available for all
> @@ -2224,6 +2238,7 @@
> 'quorum': 'BlockdevOptionsQuorum',
> 'raw': 'BlockdevOptionsGenericFormat',
> # TODO rbd: Wait for structured options
> + 'replication':'BlockdevOptionsReplication',
> # TODO sheepdog: Wait for structured options
> # TODO ssh: Should take InetSocketAddress for 'host'?
> 'tftp': 'BlockdevOptionsFile',
>
signature.asc
Description: OpenPGP digital signature
