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

block/block-copy: drop unused argument of block_copy() 

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210116214705.822267-21-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-01-17 00:47:02 +03:00 committed by Max Reitz
parent 5b49c2bdc1
commit 143a6384f5
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/backup-top.c
View File

@ -61,7 +61,7 @@ static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset,
off = QEMU_ALIGN_DOWN(offset, s->cluster_size); off = QEMU_ALIGN_DOWN(offset, s->cluster_size);
end = QEMU_ALIGN_UP(offset + bytes, s->cluster_size); end = QEMU_ALIGN_UP(offset + bytes, s->cluster_size);
return block_copy(s->bcs, off, end - off, true, NULL); return block_copy(s->bcs, off, end - off, true);
} }
static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs, static int coroutine_fn backup_top_co_pdiscard(BlockDriverState *bs,

10
block/block-copy.c
View File

@ -723,7 +723,7 @@ static int coroutine_fn block_copy_common(BlockCopyCallState *call_state)
} }
int coroutine_fn block_copy(BlockCopyState *s, int64_t start, int64_t bytes, int coroutine_fn block_copy(BlockCopyState *s, int64_t start, int64_t bytes,
bool ignore_ratelimit, bool *error_is_read) bool ignore_ratelimit)
{ {
BlockCopyCallState call_state = { BlockCopyCallState call_state = {
.s = s, .s = s,
@ -733,13 +733,7 @@ int coroutine_fn block_copy(BlockCopyState *s, int64_t start, int64_t bytes,
.max_workers = BLOCK_COPY_MAX_WORKERS, .max_workers = BLOCK_COPY_MAX_WORKERS,
}; };
int ret = block_copy_common(&call_state); return block_copy_common(&call_state);
if (error_is_read && ret < 0) {
*error_is_read = call_state.error_is_read;
}
return ret;
} }
static void coroutine_fn block_copy_async_co_entry(void *opaque) static void coroutine_fn block_copy_async_co_entry(void *opaque)

2
include/block/block-copy.h
View File

@ -35,7 +35,7 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
int64_t offset, int64_t *count); int64_t offset, int64_t *count);
int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes, int coroutine_fn block_copy(BlockCopyState *s, int64_t offset, int64_t bytes,
bool ignore_ratelimit, bool *error_is_read); bool ignore_ratelimit);
/* /*
* Run block-copy in a coroutine, create corresponding BlockCopyCallState * Run block-copy in a coroutine, create corresponding BlockCopyCallState