OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

support replication driver in blockdev-add

Browse Source 
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>
This commit is contained in:
Wen Congyang 2016-07-27 15:01:52 +08:00 committed by Stefan Hajnoczi
parent b311046696
commit 82ac554345
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qapi/block-core.json
View File

@ -252,6 +252,7 @@
# 2.3: 'host_floppy' deprecated # 2.3: 'host_floppy' deprecated
# 2.5: 'host_floppy' dropped # 2.5: 'host_floppy' dropped
# 2.6: 'luks' added # 2.6: 'luks' added
# 2.8: 'replication' added
# #
# @backing_file: #optional the name of the backing file (for copy-on-write) # @backing_file: #optional the name of the backing file (for copy-on-write)
# #
@ -1712,8 +1713,8 @@
'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop', 'data': [ 'archipelago', 'blkdebug', 'blkverify', 'bochs', 'cloop',
'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom', 'dmg', 'file', 'ftp', 'ftps', 'gluster', 'host_cdrom',
'host_device', 'http', 'https', 'luks', 'null-aio', 'null-co', 'host_device', 'http', 'https', 'luks', 'null-aio', 'null-co',
'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'tftp', 'parallels', 'qcow', 'qcow2', 'qed', 'quorum', 'raw',
'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] } 'replication', 'tftp', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
## ##
# @BlockdevOptionsFile # @BlockdevOptionsFile
@ -2175,6 +2176,23 @@
## ##
{ 'enum' : 'ReplicationMode', 'data' : [ 'primary', 'secondary' ] } { '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 # @BlockdevOptions
# #
@ -2240,6 +2258,7 @@
'quorum': 'BlockdevOptionsQuorum', 'quorum': 'BlockdevOptionsQuorum',
'raw': 'BlockdevOptionsGenericFormat', 'raw': 'BlockdevOptionsGenericFormat',
# TODO rbd: Wait for structured options # TODO rbd: Wait for structured options
'replication':'BlockdevOptionsReplication',
# TODO sheepdog: Wait for structured options # TODO sheepdog: Wait for structured options
# TODO ssh: Should take InetSocketAddress for 'host'? # TODO ssh: Should take InetSocketAddress for 'host'?
'tftp': 'BlockdevOptionsFile', 'tftp': 'BlockdevOptionsFile',