| Message ID | 1473689334-29138-16-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 09/12/2016 09:08 AM, Stefan Hajnoczi wrote: > From: Wen Congyang <wency@cn.fujitsu.com> > > Signed-off-by: Wen Congyang <wency@cn.fujitsu.com> > Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com> > Signed-off-by: Wang WeiWei <wangww.fnst@cn.fujitsu.com> > Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com> > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > Reviewed-by: Eric Blake <eblake@redhat.com> > Message-id: 1469602913-20979-12-git-send-email-xiecl.fnst@cn.fujitsu.com > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > qapi/block-core.json | 23 +++++++++++++++++++++-- > 1 file changed, 21 insertions(+), 2 deletions(-) > > +++ b/qapi/block-core.json > @@ -252,6 +252,7 @@ > # 2.3: 'host_floppy' deprecated > # 2.5: 'host_floppy' dropped > # 2.6: 'luks' added > +# 2.8: 'replication' added You added documentation here... > # > # @backing_file: #optional the name of the backing file (for copy-on-write) > # > @@ -1712,8 +1713,8 @@ ...but not for the BlockdevDriver enum. > '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' ] } Also, I failed to notice that you added TAB damage here. Other patches are currently proposed to touch the same area (nfs, ssh, nbd), so hopefully one of them will correct it in the process.
diff --git a/qapi/block-core.json b/qapi/block-core.json index 4755c75..ada3202 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -252,6 +252,7 @@ # 2.3: 'host_floppy' deprecated # 2.5: 'host_floppy' dropped # 2.6: 'luks' added +# 2.8: 'replication' added # # @backing_file: #optional the name of the backing file (for copy-on-write) # @@ -1712,8 +1713,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 @@ -2176,6 +2177,23 @@ { 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } ## +# @BlockdevOptionsReplication +# +# Driver specific block device options for replication +# +# @mode: the replication mode +# +# @top-id: #optional In secondary mode, node name or device ID of the root +# node who owns the replication node chain. Ignored in primary mode. +# +# Since: 2.8 +## +{ 'struct': 'BlockdevOptionsReplication', + 'base': 'BlockdevOptionsGenericFormat', + 'data': { 'mode': 'ReplicationMode', + '*top-id': 'str' } } + +## # @BlockdevOptions # # Options for creating a block device. Many options are available for all @@ -2240,6 +2258,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',