From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, armbru@redhat.com, eblake@redhat.com,
ehabkost@redhat.com, berrange@redhat.com, pbonzini@redhat.com,
vsementsov@virtuozzo.com, jsnow@redhat.com, mreitz@redhat.com,
kwolf@redhat.com, den@openvz.org
Subject: [PATCH 18/21] block/block-copy: make setting progress optional
Date: Mon, 17 May 2021 09:44:25 +0300 [thread overview]
Message-ID: <20210517064428.16223-20-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20210517064428.16223-1-vsementsov@virtuozzo.com>
Now block-copy will crash if user don't set progress meter by
block_copy_set_progress_meter(). copy-before-write filter will be used
in separate of backup job, and it doesn't want any progress meter (for
now). So, allow not setting it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/block-copy.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index 4126f7e8cc..63ec5c41a2 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -506,7 +506,7 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
if (ret < 0 && !t->call_state->ret) {
t->call_state->ret = ret;
t->call_state->error_is_read = error_is_read;
- } else {
+ } else if (t->s->progress) {
progress_work_done(t->s->progress, t->bytes);
}
co_put_to_shres(t->s->mem, t->bytes);
@@ -610,9 +610,11 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s,
if (!ret) {
bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
- progress_set_remaining(s->progress,
- bdrv_get_dirty_count(s->copy_bitmap) +
- s->in_flight_bytes);
+ if (s->progress) {
+ progress_set_remaining(s->progress,
+ bdrv_get_dirty_count(s->copy_bitmap) +
+ s->in_flight_bytes);
+ }
}
*count = bytes;
@@ -672,9 +674,11 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state)
}
if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) {
block_copy_task_end(task, 0);
- progress_set_remaining(s->progress,
- bdrv_get_dirty_count(s->copy_bitmap) +
- s->in_flight_bytes);
+ if (s->progress) {
+ progress_set_remaining(s->progress,
+ bdrv_get_dirty_count(s->copy_bitmap) +
+ s->in_flight_bytes);
+ }
trace_block_copy_skip_range(s, task->offset, task->bytes);
offset = task_end(task);
bytes = end - offset;
--
2.29.2
next prev parent reply other threads:[~2021-05-17 7:00 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 6:44 [PATCH 00/21] block: publish backup-top filter Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH] block/copy-on-read: use bdrv_drop_filter() and drop s->active Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 01/21] block: introduce bdrv_replace_child_bs() Vladimir Sementsov-Ogievskiy
2021-05-17 12:09 ` Max Reitz
2021-05-17 14:30 ` Vladimir Sementsov-Ogievskiy
2021-05-17 15:51 ` Max Reitz
2021-05-17 18:05 ` Vladimir Sementsov-Ogievskiy
2021-05-19 10:12 ` Vladimir Sementsov-Ogievskiy
2021-05-19 11:11 ` Max Reitz
2021-05-19 11:14 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 02/21] block: introduce blk_replace_bs Vladimir Sementsov-Ogievskiy
2021-05-17 12:32 ` Max Reitz
2021-05-17 6:44 ` [PATCH 03/21] qdev-properties: PropertyInfo: add realized_set_allowed field Vladimir Sementsov-Ogievskiy
2021-05-17 12:40 ` Max Reitz
2021-05-17 14:33 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 04/21] qdev: allow setting drive property for realized device Vladimir Sementsov-Ogievskiy
2021-05-17 15:48 ` Max Reitz
2021-05-17 18:09 ` Vladimir Sementsov-Ogievskiy
2021-05-18 9:09 ` Max Reitz
2021-05-18 9:20 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 05/21] block: rename backup-top to copy-before-write Vladimir Sementsov-Ogievskiy
2021-05-17 16:05 ` Max Reitz
2021-05-17 19:42 ` Vladimir Sementsov-Ogievskiy
2021-05-18 9:37 ` Max Reitz
2021-05-17 6:44 ` [PATCH 06/21] block/backup: drop support for copy_range Vladimir Sementsov-Ogievskiy
2021-05-17 16:20 ` Max Reitz
2021-05-17 6:44 ` [PATCH 07/21] block-copy: always set BDRV_REQ_SERIALISING flag Vladimir Sementsov-Ogievskiy
2021-05-17 16:46 ` Max Reitz
2021-05-17 6:44 ` [PATCH 08/21] block/backup: stricter backup_calculate_cluster_size() Vladimir Sementsov-Ogievskiy
2021-05-17 16:57 ` Max Reitz
2021-05-17 19:53 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 09/21] block/backup: move cluster size calculation to block-copy Vladimir Sementsov-Ogievskiy
2021-05-17 17:09 ` Max Reitz
2021-05-17 6:44 ` [PATCH 10/21] block/copy-before-write: relax permission requirements when no parents Vladimir Sementsov-Ogievskiy
2021-05-18 11:10 ` Max Reitz
2021-05-18 12:16 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 11/21] block/copy-before-write: use file child instead of backing Vladimir Sementsov-Ogievskiy
2021-05-18 11:47 ` Max Reitz
2021-05-18 12:21 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 12/21] block/copy-before-write: bdrv_cbw_append(): replace child at last Vladimir Sementsov-Ogievskiy
2021-05-18 12:35 ` Max Reitz
2021-05-17 6:44 ` [PATCH 13/21] block/copy-before-write: introduce cbw_init() Vladimir Sementsov-Ogievskiy
2021-05-18 12:53 ` Max Reitz
2021-05-17 6:44 ` [PATCH 14/21] block/copy-before-write: cbw_init(): rename variables Vladimir Sementsov-Ogievskiy
2021-05-18 13:01 ` Max Reitz
2021-05-17 6:44 ` [PATCH 15/21] block/copy-before-write: cbw_init(): use file child after attaching Vladimir Sementsov-Ogievskiy
2021-05-18 13:43 ` Max Reitz
2021-05-17 6:44 ` [PATCH 16/21] block/copy-before-write: cbw_init(): use options Vladimir Sementsov-Ogievskiy
2021-05-18 13:56 ` Max Reitz
2021-05-18 14:24 ` Vladimir Sementsov-Ogievskiy
2021-05-18 14:29 ` Max Reitz
2021-05-18 14:32 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 17/21] block/block-copy: switch to fully set bitmap by default Vladimir Sementsov-Ogievskiy
2021-05-18 14:22 ` Max Reitz
2021-05-18 14:31 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` Vladimir Sementsov-Ogievskiy [this message]
2021-05-18 14:26 ` [PATCH 18/21] block/block-copy: make setting progress optional Max Reitz
2021-05-18 14:35 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 19/21] block/copy-before-write: make public block driver Vladimir Sementsov-Ogievskiy
2021-05-18 14:46 ` Max Reitz
2021-05-17 6:44 ` [PATCH 20/21] qapi: publish copy-before-write filter Vladimir Sementsov-Ogievskiy
2021-05-18 14:48 ` Max Reitz
2021-05-18 14:56 ` Vladimir Sementsov-Ogievskiy
2021-05-17 6:44 ` [PATCH 21/21] itotests/222: add test-case for " Vladimir Sementsov-Ogievskiy
2021-05-18 15:24 ` Max Reitz
2021-05-18 15:41 ` Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210517064428.16223-20-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).