Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813558/?format=api
{ "id": 813558, "url": "http://patchwork.ozlabs.org/api/patches/813558/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-5-mreitz@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20170913181910.29688-5-mreitz@redhat.com>", "list_archive_url": null, "date": "2017-09-13T18:18:56", "name": "[04/18] block/mirror: Pull out mirror_perform()", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "5155e0b36f930368cd7cb16d61d0dd7b2452d4e7", "submitter": { "id": 36836, "url": "http://patchwork.ozlabs.org/api/people/36836/?format=api", "name": "Max Reitz", "email": "mreitz@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913181910.29688-5-mreitz@redhat.com/mbox/", "series": [ { "id": 2960, "url": "http://patchwork.ozlabs.org/api/series/2960/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2960", "date": "2017-09-13T18:18:52", "name": "block/mirror: Add active-sync mirroring", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/2960/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/813558/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813558/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx10.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mreitz@redhat.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xsqmV0qJnz9s7g\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Sep 2017 04:23:37 +1000 (AEST)", "from localhost ([::1]:43998 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dsCJz-0001mB-Bl\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 14:23:35 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:36583)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mreitz@redhat.com>) id 1dsCGb-0007zB-Js\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:20:06 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mreitz@redhat.com>) id 1dsCGa-0004wU-He\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 14:20:05 -0400", "from mx1.redhat.com ([209.132.183.28]:18800)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <mreitz@redhat.com>)\n\tid 1dsCGT-0004qQ-Q9; Wed, 13 Sep 2017 14:19:58 -0400", "from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D2C1D5D689;\n\tWed, 13 Sep 2017 18:19:56 +0000 (UTC)", "from localhost (ovpn-204-23.brq.redhat.com [10.40.204.23])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id B3CE960BE4;\n\tWed, 13 Sep 2017 18:19:48 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com D2C1D5D689", "From": "Max Reitz <mreitz@redhat.com>", "To": "qemu-block@nongnu.org", "Date": "Wed, 13 Sep 2017 20:18:56 +0200", "Message-Id": "<20170913181910.29688-5-mreitz@redhat.com>", "In-Reply-To": "<20170913181910.29688-1-mreitz@redhat.com>", "References": "<20170913181910.29688-1-mreitz@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.39]);\n\tWed, 13 Sep 2017 18:19:56 +0000 (UTC)", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]", "X-Received-From": "209.132.183.28", "Subject": "[Qemu-devel] [PATCH 04/18] block/mirror: Pull out mirror_perform()", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Kevin Wolf <kwolf@redhat.com>, Fam Zheng <famz@redhat.com>,\n\tqemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,\n\tStefan Hajnoczi <stefanha@redhat.com>, John Snow <jsnow@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "When converting mirror's I/O to coroutines, we are going to need a point\nwhere these coroutines are created. mirror_perform() is going to be\nthat point.\n\nSigned-off-by: Max Reitz <mreitz@redhat.com>\n---\n block/mirror.c | 53 ++++++++++++++++++++++++++++++-----------------------\n 1 file changed, 30 insertions(+), 23 deletions(-)", "diff": "diff --git a/block/mirror.c b/block/mirror.c\nindex 6531652d73..4664b0516f 100644\n--- a/block/mirror.c\n+++ b/block/mirror.c\n@@ -82,6 +82,12 @@ typedef struct MirrorOp {\n uint64_t bytes;\n } MirrorOp;\n \n+typedef enum MirrorMethod {\n+ MIRROR_METHOD_COPY,\n+ MIRROR_METHOD_ZERO,\n+ MIRROR_METHOD_DISCARD,\n+} MirrorMethod;\n+\n static BlockErrorAction mirror_error_action(MirrorBlockJob *s, bool read,\n int error)\n {\n@@ -324,6 +330,22 @@ static void mirror_do_zero_or_discard(MirrorBlockJob *s,\n }\n }\n \n+static unsigned mirror_perform(MirrorBlockJob *s, int64_t offset,\n+ unsigned bytes, MirrorMethod mirror_method)\n+{\n+ switch (mirror_method) {\n+ case MIRROR_METHOD_COPY:\n+ return mirror_do_read(s, offset, bytes);\n+ case MIRROR_METHOD_ZERO:\n+ case MIRROR_METHOD_DISCARD:\n+ mirror_do_zero_or_discard(s, offset, bytes,\n+ mirror_method == MIRROR_METHOD_DISCARD);\n+ return bytes;\n+ default:\n+ abort();\n+ }\n+}\n+\n static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n {\n BlockDriverState *source = s->source;\n@@ -395,11 +417,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n unsigned int io_bytes;\n int64_t io_bytes_acct;\n BlockDriverState *file;\n- enum MirrorMethod {\n- MIRROR_METHOD_COPY,\n- MIRROR_METHOD_ZERO,\n- MIRROR_METHOD_DISCARD\n- } mirror_method = MIRROR_METHOD_COPY;\n+ MirrorMethod mirror_method = MIRROR_METHOD_COPY;\n \n assert(!(offset % s->granularity));\n ret = bdrv_get_block_status_above(source, NULL,\n@@ -439,22 +457,11 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)\n }\n \n io_bytes = mirror_clip_bytes(s, offset, io_bytes);\n- switch (mirror_method) {\n- case MIRROR_METHOD_COPY:\n- io_bytes = io_bytes_acct = mirror_do_read(s, offset, io_bytes);\n- break;\n- case MIRROR_METHOD_ZERO:\n- case MIRROR_METHOD_DISCARD:\n- mirror_do_zero_or_discard(s, offset, io_bytes,\n- mirror_method == MIRROR_METHOD_DISCARD);\n- if (write_zeroes_ok) {\n- io_bytes_acct = 0;\n- } else {\n- io_bytes_acct = io_bytes;\n- }\n- break;\n- default:\n- abort();\n+ io_bytes = mirror_perform(s, offset, io_bytes, mirror_method);\n+ if (mirror_method != MIRROR_METHOD_COPY && write_zeroes_ok) {\n+ io_bytes_acct = 0;\n+ } else {\n+ io_bytes_acct = io_bytes;\n }\n assert(io_bytes);\n offset += io_bytes;\n@@ -650,8 +657,8 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)\n continue;\n }\n \n- mirror_do_zero_or_discard(s, sector_num * BDRV_SECTOR_SIZE,\n- nb_sectors * BDRV_SECTOR_SIZE, false);\n+ mirror_perform(s, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE, MIRROR_METHOD_ZERO);\n sector_num += nb_sectors;\n }\n \n", "prefixes": [ "04/18" ] }