From patchwork Fri Nov 15 14:14:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1195659 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47F0vt3vBkz9sP6 for ; Sat, 16 Nov 2019 01:23:54 +1100 (AEDT) Received: from localhost ([::1]:39848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcVr-0004TL-Qx for incoming@patchwork.ozlabs.org; Fri, 15 Nov 2019 09:23:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59000) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcNK-0004dF-Oe for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:15:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVcNJ-0001xS-Gk for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:15:02 -0500 Received: from relay.sw.ru ([185.231.240.75]:47452) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVcNG-0001rs-J4; Fri, 15 Nov 2019 09:14:58 -0500 Received: from vovaso.qa.sw.ru ([10.94.3.0] helo=kvm.qa.sw.ru) by relay.sw.ru with esmtp (Exim 4.92.3) (envelope-from ) id 1iVcN5-0006WW-Ad; Fri, 15 Nov 2019 17:14:47 +0300 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [RFC 12/24] block/block-copy: move block_copy_task_create down Date: Fri, 15 Nov 2019 17:14:32 +0300 Message-Id: <20191115141444.24155-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191115141444.24155-1-vsementsov@virtuozzo.com> References: <20191115141444.24155-1-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 185.231.240.75 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, ehabkost@redhat.com, wencongyang2@huawei.com, xiechanglong.d@gmail.com, armbru@redhat.com, qemu-devel@nongnu.org, jsnow@redhat.com, crosa@redhat.com, den@openvz.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- block/block-copy.c | 64 +++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/block/block-copy.c b/block/block-copy.c index 0525a9fcd5..4e8c64a45d 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -111,38 +111,6 @@ static bool coroutine_fn block_copy_wait_one(BlockCopyState *s, int64_t start, 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(!block_copy_find_task(s, offset, bytes)); - - bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, 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 void coroutine_fn block_copy_task_shrink(BlockCopyTask *task, int64_t new_bytes) { @@ -348,6 +316,38 @@ 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(!block_copy_find_task(s, offset, bytes)); + + bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, 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) {