From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, den@openvz.org, vsementsov@virtuozzo.com,
qemu-devel@nongnu.org, mreitz@redhat.com
Subject: [PATCH v2 5/6] block/block-copy: move block_copy_task_create down
Date: Wed, 25 Mar 2020 16:46:38 +0300 [thread overview]
Message-ID: <20200325134639.16337-6-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20200325134639.16337-1-vsementsov@virtuozzo.com>
Simple movement without any change. It's needed for the following
patch, as this function will need to use some staff which is currently
below it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/block-copy.c | 66 +++++++++++++++++++++++-----------------------
1 file changed, 33 insertions(+), 33 deletions(-)
diff --git a/block/block-copy.c b/block/block-copy.c
index dd406eb4bb..910947cb43 100644
--- a/block/block-copy.c
+++ b/block/block-copy.c
@@ -106,39 +106,6 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t offset,
return true;
}
-static BlockCopyTask *block_copy_task_create(BlockCopyState *s,
- int64_t offset, int64_t bytes)
-{
- int64_t next_zero;
- BlockCopyTask *task = g_new(BlockCopyTask, 1);
-
- assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset));
-
- bytes = MIN(bytes, s->copy_size);
- next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, bytes);
- if (next_zero >= 0) {
- assert(next_zero > offset); /* offset is dirty */
- assert(next_zero < offset + bytes); /* no need to do MIN() */
- bytes = next_zero - offset;
- }
-
- /* region is dirty, so no existent tasks possible in it */
- assert(!find_conflicting_task(s, offset, bytes));
-
- bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
- s->in_flight_bytes += bytes;
-
- *task = (BlockCopyTask) {
- .s = s,
- .offset = offset,
- .bytes = bytes,
- };
- qemu_co_queue_init(&task->wait_queue);
- QLIST_INSERT_HEAD(&s->tasks, task, list);
-
- return task;
-}
-
/*
* block_copy_task_shrink
*
@@ -361,6 +328,39 @@ out:
return ret;
}
+static BlockCopyTask *block_copy_task_create(BlockCopyState *s,
+ int64_t offset, int64_t bytes)
+{
+ int64_t next_zero;
+ BlockCopyTask *task = g_new(BlockCopyTask, 1);
+
+ assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset));
+
+ bytes = MIN(bytes, s->copy_size);
+ next_zero = bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, bytes);
+ if (next_zero >= 0) {
+ assert(next_zero > offset); /* offset is dirty */
+ assert(next_zero < offset + bytes); /* no need to do MIN() */
+ bytes = next_zero - offset;
+ }
+
+ /* region is dirty, so no existent tasks possible in it */
+ assert(!find_conflicting_task(s, offset, bytes));
+
+ bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes);
+ s->in_flight_bytes += bytes;
+
+ *task = (BlockCopyTask) {
+ .s = s,
+ .offset = offset,
+ .bytes = bytes,
+ };
+ qemu_co_queue_init(&task->wait_queue);
+ QLIST_INSERT_HEAD(&s->tasks, task, list);
+
+ return task;
+}
+
static int block_copy_block_status(BlockCopyState *s, int64_t offset,
int64_t bytes, int64_t *pnum)
{
--
2.21.0
next prev parent reply other threads:[~2020-03-25 13:48 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-25 13:46 [PATCH v2 0/6] block-copy: use aio-task-pool Vladimir Sementsov-Ogievskiy
2020-03-25 13:46 ` [PATCH v2 1/6] block/block-copy: rename in-flight requests to tasks Vladimir Sementsov-Ogievskiy
2020-04-28 7:30 ` Max Reitz
2020-04-28 9:18 ` Vladimir Sementsov-Ogievskiy
2020-03-25 13:46 ` [PATCH v2 2/6] block/block-copy: alloc task on each iteration Vladimir Sementsov-Ogievskiy
2020-04-28 7:44 ` Max Reitz
2020-03-25 13:46 ` [PATCH v2 3/6] block/block-copy: add state pointer to BlockCopyTask Vladimir Sementsov-Ogievskiy
2020-04-28 8:14 ` Max Reitz
2020-03-25 13:46 ` [PATCH v2 4/6] block/block-copy: move task size initial calculation to _task_create Vladimir Sementsov-Ogievskiy
2020-04-28 8:52 ` Max Reitz
2020-04-28 9:28 ` Vladimir Sementsov-Ogievskiy
2020-03-25 13:46 ` Vladimir Sementsov-Ogievskiy [this message]
2020-04-28 9:06 ` [PATCH v2 5/6] block/block-copy: move block_copy_task_create down Max Reitz
2020-04-28 9:17 ` Vladimir Sementsov-Ogievskiy
2020-04-28 10:05 ` Max Reitz
2020-03-25 13:46 ` [PATCH v2 6/6] block/block-copy: use aio-task-pool API Vladimir Sementsov-Ogievskiy
2020-04-28 10:01 ` Max Reitz
2020-04-22 14:30 ` [PATCH v2 0/6] block-copy: use aio-task-pool 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=20200325134639.16337-6-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--cc=kwolf@redhat.com \
--cc=mreitz@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).