diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-01-16 22:47:02 +0100 |
|---|---|---|
| committer | Max Reitz | 2021-01-26 14:36:37 +0100 |
| commit | 143a6384f5ecb7c660c6d5d2622993c49bfbfa5d (patch) | |
| tree | 676aabec1fd22912c212e97fa321e9410bf40c75 | |
| parent | block/block-copy: drop unused block_copy_set_progress_callback() (diff) | |
| download | qemu-143a6384f5ecb7c660c6d5d2622993c49bfbfa5d.tar.gz qemu-143a6384f5ecb7c660c6d5d2622993c49bfbfa5d.tar.xz qemu-143a6384f5ecb7c660c6d5d2622993c49bfbfa5d.zip | |
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>
| -rw-r--r-- | block/backup-top.c | 2 | ||||
| -rw-r--r-- | block/block-copy.c | 10 | ||||
| -rw-r--r-- | include/block/block-copy.h | 2 |
3 files changed, 4 insertions, 10 deletions
diff --git a/block/backup-top.c b/block/backup-top.c index 779956ddc2..6e7e7bf340 100644 --- a/block/backup-top.c +++ b/block/backup-top.c @@ -61,7 +61,7 @@ static coroutine_fn int backup_top_cbw(BlockDriverState *bs, uint64_t offset, off = QEMU_ALIGN_DOWN(offset, 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, diff --git a/block/block-copy.c b/block/block-copy.c index 2ea8b28684..39ae481c8b 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -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, - bool ignore_ratelimit, bool *error_is_read) + bool ignore_ratelimit) { BlockCopyCallState call_state = { .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, }; - int ret = block_copy_common(&call_state); - - if (error_is_read && ret < 0) { - *error_is_read = call_state.error_is_read; - } - - return ret; + return block_copy_common(&call_state); } static void coroutine_fn block_copy_async_co_entry(void *opaque) diff --git a/include/block/block-copy.h b/include/block/block-copy.h index 1cbea0b79b..338f2ea7fd 100644 --- a/include/block/block-copy.h +++ b/include/block/block-copy.h @@ -35,7 +35,7 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s, int64_t offset, int64_t *count); 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 |