diff mbox

[v22,10/10] support replication driver in blockdev-add

Message ID 1469182567-3114-11-git-send-email-wangww.fnst@cn.fujitsu.com
State New
Headers show

Commit Message

Wang WeiWei July 22, 2016, 10:16 a.m. UTC 
From: Wen Congyang <wency@cn.fujitsu.com>

Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Wang WeiWei <wangww.fnst@cn.fujitsu.com>
---
 qapi/block-core.json | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

Comments

Max Reitz July 25, 2016, 11 p.m. UTC | #1 
On 22.07.2016 12:16, Wang WeiWei wrote:
> From: Wen Congyang <wency@cn.fujitsu.com>
> 
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
> Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Wang WeiWei <wangww.fnst@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',
>
Changlong Xie July 26, 2016, 2:41 a.m. UTC | #2 
On 07/26/2016 07:00 AM, Max Reitz wrote:
> On 22.07.2016 12:16, Wang WeiWei wrote:
>> From: Wen Congyang <wency@cn.fujitsu.com>
>>
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> Signed-off-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
>> Reviewed-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: Wang WeiWei <wangww.fnst@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

yes

>
>>   #
>>   # @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?

Sorry, i'll add it in next version

>
>> +#
>> +# Since: 2.7
>
> 2.8

yes.

>
> 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',
>>
>
>
diff mbox

Patch

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
 #
 # @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
+#
+# Since: 2.7
+##
+{ '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',