openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

block/block-copy: Simplify block_copy_do_copy() 

block_copy_do_copy() is static, only used in block_copy_task_entry
with the error_is_read argument set. No need to check for it,
simplify.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200507121129.29760-3-philmd@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-07 14:11:29 +02:00 committed by Kevin Wolf
parent c78dd00e35
commit d7eca54222
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/block-copy.c
View File

@ -343,9 +343,7 @@ static int coroutine_fn block_copy_do_copy(BlockCopyState *s,
~BDRV_REQ_WRITE_COMPRESSED); ~BDRV_REQ_WRITE_COMPRESSED);
if (ret < 0) { if (ret < 0) {
trace_block_copy_write_zeroes_fail(s, offset, ret); trace_block_copy_write_zeroes_fail(s, offset, ret);
if (error_is_read) { *error_is_read = false;
*error_is_read = false;
}
} }
return ret; return ret;
} }
@ -393,9 +391,7 @@ static int coroutine_fn block_copy_do_copy(BlockCopyState *s,
ret = bdrv_co_pread(s->source, offset, nbytes, bounce_buffer, 0); ret = bdrv_co_pread(s->source, offset, nbytes, bounce_buffer, 0);
if (ret < 0) { if (ret < 0) {
trace_block_copy_read_fail(s, offset, ret); trace_block_copy_read_fail(s, offset, ret);
if (error_is_read) { *error_is_read = true;
*error_is_read = true;
}
goto out; goto out;
} }
@ -403,9 +399,7 @@ static int coroutine_fn block_copy_do_copy(BlockCopyState *s,
s->write_flags); s->write_flags);
if (ret < 0) { if (ret < 0) {
trace_block_copy_write_fail(s, offset, ret); trace_block_copy_write_fail(s, offset, ret);
if (error_is_read) { *error_is_read = false;
*error_is_read = false;
}
goto out; goto out;
} }