From nobody Wed Nov 5 10:42:40 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1534127663691959.2539320850867; Sun, 12 Aug 2018 19:34:23 -0700 (PDT) Received: from localhost ([::1]:37231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp2gK-0006X9-2v for importer@patchew.org; Sun, 12 Aug 2018 22:34:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp2TT-0003nM-Go for qemu-devel@nongnu.org; Sun, 12 Aug 2018 22:20:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fp2TS-0008Kv-Mw for qemu-devel@nongnu.org; Sun, 12 Aug 2018 22:20:51 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40356 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fp2TP-0008JP-4Y; Sun, 12 Aug 2018 22:20:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE87940241C5; Mon, 13 Aug 2018 02:20:46 +0000 (UTC) Received: from localhost (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A80C2156712; Mon, 13 Aug 2018 02:20:46 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 13 Aug 2018 04:20:03 +0200 Message-Id: <20180813022006.7216-15-mreitz@redhat.com> In-Reply-To: <20180813022006.7216-1-mreitz@redhat.com> References: <20180813022006.7216-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 13 Aug 2018 02:20:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 13 Aug 2018 02:20:46 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 14/17] mirror: Inline mirror_iteration_done() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Jeff Cody , Fam Zheng , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" mirror_co_perform() is the sole user of that function, and it looks a bit weird now. This patch inlines it into mirror_co_perform(). Signed-off-by: Max Reitz --- block/mirror.c | 53 ++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index 62fd499799..053c37b6a6 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -154,35 +154,6 @@ static void coroutine_fn mirror_wait_on_conflicts(Mirr= orOp *self, } } =20 -static void coroutine_fn mirror_iteration_done(MirrorOp *op, int ret) -{ - MirrorBlockJob *s =3D op->s; - int64_t chunk_num; - int nb_chunks; - - trace_mirror_iteration_done(s, op->offset, op->bytes, ret); - - s->in_flight--; - s->bytes_in_flight -=3D op->bytes; - - chunk_num =3D op->offset / s->granularity; - nb_chunks =3D DIV_ROUND_UP(op->bytes, s->granularity); - - bitmap_clear(s->in_flight_bitmap, chunk_num, nb_chunks); - QTAILQ_REMOVE(&s->ops_in_flight, op, next); - if (ret >=3D 0) { - if (s->cow_bitmap) { - bitmap_set(s->cow_bitmap, chunk_num, nb_chunks); - } - if (!s->initial_zeroing_ongoing) { - job_progress_update(&s->common.job, op->bytes); - } - } - - qemu_co_queue_restart_all(&op->waiting_requests); - g_free(op); -} - /* Clip bytes relative to offset to not exceed end-of-file */ static inline int64_t mirror_clip_bytes(MirrorBlockJob *s, int64_t offset, @@ -373,6 +344,8 @@ static void coroutine_fn mirror_co_perform(void *opaque) MirrorOp *op =3D opaque; MirrorBlockJob *s =3D op->s; AioContext *aio_context; + int64_t chunk_num; + int nb_chunks; bool failed_on_read =3D false; int ret; =20 @@ -403,7 +376,27 @@ static void coroutine_fn mirror_co_perform(void *opaqu= e) } } =20 - mirror_iteration_done(op, ret); + trace_mirror_iteration_done(s, op->offset, op->bytes, ret); + + s->in_flight--; + s->bytes_in_flight -=3D op->bytes; + + chunk_num =3D op->offset / s->granularity; + nb_chunks =3D DIV_ROUND_UP(op->bytes, s->granularity); + + bitmap_clear(s->in_flight_bitmap, chunk_num, nb_chunks); + QTAILQ_REMOVE(&s->ops_in_flight, op, next); + if (ret >=3D 0) { + if (s->cow_bitmap) { + bitmap_set(s->cow_bitmap, chunk_num, nb_chunks); + } + if (!s->initial_zeroing_ongoing) { + job_progress_update(&s->common.job, op->bytes); + } + } + + qemu_co_queue_restart_all(&op->waiting_requests); + g_free(op); =20 aio_context_release(aio_context); } --=20 2.17.1