From nobody Mon Feb 9 02:51:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1573827892; cv=none; d=zoho.com; s=zohoarc; b=HcSTjF/mtTqb10OiaCUu/N8v83gAHBn7uBlwFE7ifi4z0GCc4SQxy+0PvjSR1jdshDtgJYLVyN5wwe7IOS+FAGxC263x8DOni20xvTYIZegWwnoyacOa/8DH3upqxt+AkZWV93XgedprVRzbr8XW8Y5VTa9o50wNXavk9/UMlxs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573827892; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lpu3ZX0gd7zlGO66LLYnvvPom4F5yCpFX3joKL8An84=; b=G5OSY9FtyiZnN5G/N5ZHy7SKU19gfu3KAsIZzdkXUz3M5JEePJ+E06h/zsyauuNlykk8kUV4tY2Qyvs5u+EAe0epgKwrDm+RMNWtc0aclUYhFX4HZhMNqyqUw0ejvoR8EyI7yEqY2wpaub++uA7mkdABmnVajx8b9VM5VQzvXOc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157382789232363.19789613839771; Fri, 15 Nov 2019 06:24:52 -0800 (PST) Received: from localhost ([::1]:39866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcWo-0006B7-QP for importer@patchew.org; Fri, 15 Nov 2019 09:24:50 -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 Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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(BlockCopy= State *s, int64_t start, return true; } =20 -static BlockCopyTask *block_copy_task_create(BlockCopyState *s, - int64_t offset, int64_t bytes) -{ - int64_t next_zero; - BlockCopyTask *task =3D g_new(BlockCopyTask, 1); - - assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset)); - - bytes =3D MIN(bytes, s->copy_size); - next_zero =3D bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, byte= s); - if (next_zero >=3D 0) { - assert(next_zero > offset); /* offset is dirty */ - assert(next_zero < offset + bytes); /* no need to do MIN() */ - bytes =3D 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 =3D (BlockCopyTask) { - .s =3D s, - .offset =3D offset, - .bytes =3D 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; } =20 +static BlockCopyTask *block_copy_task_create(BlockCopyState *s, + int64_t offset, int64_t bytes) +{ + int64_t next_zero; + BlockCopyTask *task =3D g_new(BlockCopyTask, 1); + + assert(bdrv_dirty_bitmap_get(s->copy_bitmap, offset)); + + bytes =3D MIN(bytes, s->copy_size); + next_zero =3D bdrv_dirty_bitmap_next_zero(s->copy_bitmap, offset, byte= s); + if (next_zero >=3D 0) { + assert(next_zero > offset); /* offset is dirty */ + assert(next_zero < offset + bytes); /* no need to do MIN() */ + bytes =3D 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 =3D (BlockCopyTask) { + .s =3D s, + .offset =3D offset, + .bytes =3D 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) { --=20 2.21.0