Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813503/?format=api
{ "id": 813503, "url": "http://patchwork.ozlabs.org/api/patches/813503/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-12-eblake@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": "<20170913160333.23622-12-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-13T16:03:21", "name": "[v4,11/23] block: Switch bdrv_co_get_block_status_above() to byte-based", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "75b1bfabca9276232599b83acdd2108db239e07c", "submitter": { "id": 6591, "url": "http://patchwork.ozlabs.org/api/people/6591/?format=api", "name": "Eric Blake", "email": "eblake@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-12-eblake@redhat.com/mbox/", "series": [ { "id": 2944, "url": "http://patchwork.ozlabs.org/api/series/2944/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2944", "date": "2017-09-13T16:03:10", "name": "make bdrv_get_block_status byte-based", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/2944/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/813503/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813503/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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@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 3xsmjN2y7Yz9sNV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Sep 2017 02:05:44 +1000 (AEST)", "from localhost ([::1]:43320 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 1dsAAY-00026p-Gu\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 12:05:42 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:45846)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsA9Q-0001fX-QM\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:33 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dsA9P-0006DQ-OV\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:32 -0400", "from mx1.redhat.com ([209.132.183.28]:52138)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <eblake@redhat.com>)\n\tid 1dsA9K-00069x-UV; Wed, 13 Sep 2017 12:04:27 -0400", "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 00F9585542;\n\tWed, 13 Sep 2017 16:04:26 +0000 (UTC)", "from red.redhat.com (ovpn-120-201.rdu2.redhat.com [10.10.120.201])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7DE965C6D2;\n\tWed, 13 Sep 2017 16:04:24 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 00F9585542", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 13 Sep 2017 11:03:21 -0500", "Message-Id": "<20170913160333.23622-12-eblake@redhat.com>", "In-Reply-To": "<20170913160333.23622-1-eblake@redhat.com>", "References": "<20170913160333.23622-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tWed, 13 Sep 2017 16:04:26 +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 v4 11/23] block: Switch\n\tbdrv_co_get_block_status_above() to byte-based", "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": "kwolf@redhat.com, famz@redhat.com, qemu-block@nongnu.org,\n\tMax Reitz <mreitz@redhat.com>,\n\tStefan Hajnoczi <stefanha@redhat.com>, 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": "We are gradually converting to byte-based interfaces, as they are\neasier to reason about than sector-based. Convert another internal\ntype (no semantic change), and rename it to match the corresponding\npublic function rename.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\nReviewed-by: Fam Zheng <famz@redhat.com>\n\n---\nv3: rebase to allocation/mapping sense change, simple enough to keep R-b\nv2: rebase to earlier changes\n---\n block/io.c | 48 ++++++++++++++++++------------------------------\n 1 file changed, 18 insertions(+), 30 deletions(-)", "diff": "diff --git a/block/io.c b/block/io.c\nindex bc0e3fd0e2..409cfe0938 100644\n--- a/block/io.c\n+++ b/block/io.c\n@@ -1893,12 +1893,12 @@ out:\n return ret;\n }\n\n-static int64_t coroutine_fn bdrv_co_get_block_status_above(BlockDriverState *bs,\n+static int64_t coroutine_fn bdrv_co_block_status_above(BlockDriverState *bs,\n BlockDriverState *base,\n bool mapping,\n- int64_t sector_num,\n- int nb_sectors,\n- int *pnum,\n+ int64_t offset,\n+ int64_t bytes,\n+ int64_t *pnum,\n BlockDriverState **file)\n {\n BlockDriverState *p;\n@@ -1907,17 +1907,10 @@ static int64_t coroutine_fn bdrv_co_get_block_status_above(BlockDriverState *bs,\n\n assert(bs != base);\n for (p = bs; p != base; p = backing_bs(p)) {\n- int64_t count;\n-\n- ret = bdrv_co_block_status(p, mapping,\n- sector_num * BDRV_SECTOR_SIZE,\n- nb_sectors * BDRV_SECTOR_SIZE, &count,\n- file);\n+ ret = bdrv_co_block_status(p, mapping, offset, bytes, pnum, file);\n if (ret < 0) {\n break;\n }\n- assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE));\n- *pnum = count >> BDRV_SECTOR_BITS;\n if (ret & BDRV_BLOCK_ZERO && ret & BDRV_BLOCK_EOF && !first) {\n /*\n * Reading beyond the end of the file continues to read\n@@ -1925,39 +1918,35 @@ static int64_t coroutine_fn bdrv_co_get_block_status_above(BlockDriverState *bs,\n * unallocated length we learned from an earlier\n * iteration.\n */\n- *pnum = nb_sectors;\n+ *pnum = bytes;\n }\n if (ret & (BDRV_BLOCK_ZERO | BDRV_BLOCK_DATA)) {\n break;\n }\n- /* [sector_num, pnum] unallocated on this layer, which could be only\n- * the first part of [sector_num, nb_sectors]. */\n- nb_sectors = MIN(nb_sectors, *pnum);\n+ /* [offset, pnum] unallocated on this layer, which could be only\n+ * the first part of [offset, bytes]. */\n+ bytes = MIN(bytes, *pnum);\n first = false;\n }\n return ret;\n }\n\n /* Coroutine wrapper for bdrv_get_block_status_above() */\n-static void coroutine_fn bdrv_get_block_status_above_co_entry(void *opaque)\n+static void coroutine_fn bdrv_block_status_above_co_entry(void *opaque)\n {\n BdrvCoBlockStatusData *data = opaque;\n- int n;\n\n- data->ret = bdrv_co_get_block_status_above(data->bs, data->base,\n- data->mapping,\n- data->offset >> BDRV_SECTOR_BITS,\n- data->bytes >> BDRV_SECTOR_BITS,\n- &n,\n- data->file);\n- *data->pnum = n * BDRV_SECTOR_SIZE;\n+ data->ret = bdrv_co_block_status_above(data->bs, data->base,\n+ data->mapping,\n+ data->offset, data->bytes,\n+ data->pnum, data->file);\n data->done = true;\n }\n\n /*\n- * Synchronous wrapper around bdrv_co_get_block_status_above().\n+ * Synchronous wrapper around bdrv_co_block_status_above().\n *\n- * See bdrv_co_get_block_status_above() for details.\n+ * See bdrv_co_block_status_above() for details.\n */\n static int64_t bdrv_common_block_status_above(BlockDriverState *bs,\n BlockDriverState *base,\n@@ -1980,10 +1969,9 @@ static int64_t bdrv_common_block_status_above(BlockDriverState *bs,\n\n if (qemu_in_coroutine()) {\n /* Fast-path if already in coroutine context */\n- bdrv_get_block_status_above_co_entry(&data);\n+ bdrv_block_status_above_co_entry(&data);\n } else {\n- co = qemu_coroutine_create(bdrv_get_block_status_above_co_entry,\n- &data);\n+ co = qemu_coroutine_create(bdrv_block_status_above_co_entry, &data);\n bdrv_coroutine_enter(bs, co);\n BDRV_POLL_WHILE(bs, !data.done);\n }\n", "prefixes": [ "v4", "11/23" ] }