Commit 82ac5543 authored by Wen Congyang's avatar Wen Congyang Committed by Stefan Hajnoczi
Browse files

support replication driver in blockdev-add 



Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
Signed-off-by: default avatarChanglong Xie <xiecl.fnst@cn.fujitsu.com>
Signed-off-by: default avatarWang WeiWei <wangww.fnst@cn.fujitsu.com>
Signed-off-by: default avatarzhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: default avatarGonglei <arei.gonglei@huawei.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1469602913-20979-12-git-send-email-xiecl.fnst@cn.fujitsu.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent b3110466

qapi/block-core.json

+21 −2
Original line number Diff line number Diff line
@@ -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
@@ -2175,6 +2176,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

#
@@ -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',