From nobody Wed Nov 5 10:41:21 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153412716911356.50552266668569; Sun, 12 Aug 2018 19:26:09 -0700 (PDT) Received: from localhost ([::1]:37189 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp2YZ-0008Ep-WE for importer@patchew.org; Sun, 12 Aug 2018 22:26:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53168) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fp2TB-0003WJ-5C for qemu-devel@nongnu.org; Sun, 12 Aug 2018 22:20:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fp2TA-0008BQ-1m for qemu-devel@nongnu.org; Sun, 12 Aug 2018 22:20:33 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40342 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 1fp2T4-0007y2-SD; Sun, 12 Aug 2018 22:20:26 -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 38F8B40241C0; Mon, 13 Aug 2018 02:20:26 +0000 (UTC) Received: from localhost (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB77D2156712; Mon, 13 Aug 2018 02:20:25 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 13 Aug 2018 04:19:55 +0200 Message-Id: <20180813022006.7216-7-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:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Mon, 13 Aug 2018 02:20:26 +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 06/17] mirror: Create mirror_co_perform() 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" While very simple now, this function will be fattened in future patches. Signed-off-by: Max Reitz --- block/mirror.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/block/mirror.c b/block/mirror.c index f05404e557..89452ad371 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -85,8 +85,16 @@ typedef struct MirrorBDSOpaque { MirrorBlockJob *job; } MirrorBDSOpaque; =20 +typedef enum MirrorMethod { + MIRROR_METHOD_COPY, + MIRROR_METHOD_ZERO, + MIRROR_METHOD_DISCARD, +} MirrorMethod; + struct MirrorOp { MirrorBlockJob *s; + MirrorMethod mirror_method; + QEMUIOVector qiov; int64_t offset; int64_t bytes; @@ -98,12 +106,6 @@ struct MirrorOp { QTAILQ_ENTRY(MirrorOp) next; }; =20 -typedef enum MirrorMethod { - MIRROR_METHOD_COPY, - MIRROR_METHOD_ZERO, - MIRROR_METHOD_DISCARD, -} MirrorMethod; - static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read, int error) { @@ -387,6 +389,25 @@ static void coroutine_fn mirror_co_discard(void *opaqu= e) mirror_write_complete(op, ret); } =20 +static void coroutine_fn mirror_co_perform(void *opaque) +{ + MirrorOp *op =3D opaque; + + switch (op->mirror_method) { + case MIRROR_METHOD_COPY: + mirror_co_read(opaque); + return; + case MIRROR_METHOD_ZERO: + mirror_co_zero(opaque); + return; + case MIRROR_METHOD_DISCARD: + mirror_co_discard(opaque); + return; + default: + abort(); + } +} + /* If mirror_method =3D=3D MIRROR_METHOD_COPY, *offset and *bytes will be * aligned as necessary */ static void mirror_perform(MirrorBlockJob *s, int64_t *offset, int64_t *by= tes, @@ -402,24 +423,13 @@ static void mirror_perform(MirrorBlockJob *s, int64_t= *offset, int64_t *bytes, op =3D g_new(MirrorOp, 1); *op =3D (MirrorOp){ .s =3D s, + .mirror_method =3D mirror_method, .offset =3D *offset, .bytes =3D *bytes, }; qemu_co_queue_init(&op->waiting_requests); =20 - switch (mirror_method) { - case MIRROR_METHOD_COPY: - co =3D qemu_coroutine_create(mirror_co_read, op); - break; - case MIRROR_METHOD_ZERO: - co =3D qemu_coroutine_create(mirror_co_zero, op); - break; - case MIRROR_METHOD_DISCARD: - co =3D qemu_coroutine_create(mirror_co_discard, op); - break; - default: - abort(); - } + co =3D qemu_coroutine_create(mirror_co_perform, op); =20 QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next); qemu_coroutine_enter(co); --=20 2.17.1