On 03/26/2015 03:03 PM, Fam Zheng wrote:
> On Wed, 03/25 17:36, Wen Congyang wrote:
>> 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>
>> ---
>> block.c | 18 ++++++++++++++++++
>> 1 file changed, 18 insertions(+)
>>
>> diff --git a/block.c b/block.c
>> index bd7fa9c..3af5ad4 100644
>> --- a/block.c
>> +++ b/block.c
>> @@ -6368,6 +6368,12 @@ BlockAcctStats *bdrv_get_stats(BlockDriverState *bs)
>> void bdrv_start_replication(BlockDriverState *bs, COLOMode mode, Error
>> **errp)
>> {
>> BlockDriver *drv = bs->drv;
>> + Error *local_err = NULL;
>> +
>> + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE,
>> &local_err)) {
>> + error_free(local_err);
>
> local_err is set but not used, just pass NULL. Same below.
Yes, will fix it in the next version.
Thanks
Wen Congyang
>
>> + return;
>> + }
>>
>> if (drv && drv->bdrv_start_replication) {
>> drv->bdrv_start_replication(bs, mode, errp);
>> @@ -6381,6 +6387,12 @@ void bdrv_start_replication(BlockDriverState *bs,
>> COLOMode mode, Error **errp)
>> void bdrv_do_checkpoint(BlockDriverState *bs, Error **errp)
>> {
>> BlockDriver *drv = bs->drv;
>> + Error *local_err = NULL;
>> +
>> + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE,
>> &local_err)) {
>> + error_free(local_err);
>> + return;
>> + }
>>
>> if (drv && drv->bdrv_do_checkpoint) {
>> drv->bdrv_do_checkpoint(bs, errp);
>> @@ -6394,6 +6406,12 @@ void bdrv_do_checkpoint(BlockDriverState *bs, Error
>> **errp)
>> void bdrv_stop_replication(BlockDriverState *bs, Error **errp)
>> {
>> BlockDriver *drv = bs->drv;
>> + Error *local_err = NULL;
>> +
>> + if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_BACKING_REFERENCE,
>> &local_err)) {
>> + error_free(local_err);
>> + return;
>> + }
>>
>> if (drv && drv->bdrv_stop_replication) {
>> drv->bdrv_stop_replication(bs, errp);
>> --
>> 2.1.0
>>
> .
>
