[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 41/53] block/block-copy: make progress_bytes_callback optional
From: |
Max Reitz |
Subject: |
[PULL 41/53] block/block-copy: make progress_bytes_callback optional |
Date: |
Tue, 26 Jan 2021 15:20:04 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
We are going to stop use of this callback in the following commit.
Still the callback handling code will be dropped in a separate commit.
So, for now let's make it optional.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210116214705.822267-16-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/block-copy.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index 82cf945693..61d82d9a1c 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -454,7 +454,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
t->call_state->error_is_read = error_is_read;
} else {
progress_work_done(t->s->progress, t->bytes);
- t->s->progress_bytes_callback(t->bytes, t->s->progress_opaque);
+ if (t->s->progress_bytes_callback) {
+ t->s->progress_bytes_callback(t->bytes, t->s->progress_opaque);
+ }
}
co_put_to_shres(t->s->mem, t->bytes);
block_copy_task_end(t, ret);
--
2.29.2
- [PULL 31/53] block/block-copy: add ratelimit to block-copy, (continued)
- [PULL 31/53] block/block-copy: add ratelimit to block-copy, Max Reitz, 2021/01/26
- [PULL 33/53] blockjob: add set_speed to BlockJobDriver, Max Reitz, 2021/01/26
- [PULL 34/53] job: call job_enter from job_pause, Max Reitz, 2021/01/26
- [PULL 35/53] qapi: backup: add max-chunk and max-workers to x-perf struct, Max Reitz, 2021/01/26
- [PULL 32/53] block/block-copy: add block_copy_cancel, Max Reitz, 2021/01/26
- [PULL 36/53] iotests: 56: prepare for backup over block-copy, Max Reitz, 2021/01/26
- [PULL 37/53] iotests/129: Limit backup's max-chunk/max-workers, Max Reitz, 2021/01/26
- [PULL 38/53] iotests: 185: prepare for backup over block-copy, Max Reitz, 2021/01/26
- [PULL 39/53] iotests: 219: prepare for backup over block-copy, Max Reitz, 2021/01/26
- [PULL 40/53] iotests: 257: prepare for backup over block-copy, Max Reitz, 2021/01/26
- [PULL 41/53] block/block-copy: make progress_bytes_callback optional,
Max Reitz <=
- [PULL 42/53] block/backup: drop extra gotos from backup_run(), Max Reitz, 2021/01/26
- [PULL 43/53] backup: move to block-copy, Max Reitz, 2021/01/26
- [PULL 44/53] qapi: backup: disable copy_range by default, Max Reitz, 2021/01/26
- [PULL 48/53] simplebench: bench_block_job: add cmd_options argument, Max Reitz, 2021/01/26
- [PULL 45/53] block/block-copy: drop unused block_copy_set_progress_callback(), Max Reitz, 2021/01/26
- [PULL 49/53] simplebench: add bench-backup.py, Max Reitz, 2021/01/26
- [PULL 47/53] simplebench/bench_block_job: use correct shebang line with python3, Max Reitz, 2021/01/26
- [PULL 46/53] block/block-copy: drop unused argument of block_copy(), Max Reitz, 2021/01/26
- [PULL 50/53] block: report errno when flock fcntl fails, Max Reitz, 2021/01/26
- [PULL 52/53] iotests/118: Drop 'change' test, Max Reitz, 2021/01/26