Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813065/?format=api
{ "id": 813065, "url": "http://patchwork.ozlabs.org/api/patches/813065/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912203119.24166-17-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": "<20170912203119.24166-17-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-12T20:31:15", "name": "[v7,16/20] qcow2: Switch qcow2_measure() to byte-based iteration", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "4548b03b0ce3effd37b1bf3ed7194b3b7ead7fb2", "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/20170912203119.24166-17-eblake@redhat.com/mbox/", "series": [ { "id": 2770, "url": "http://patchwork.ozlabs.org/api/series/2770/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2770", "date": "2017-09-12T20:31:00", "name": "make dirty-bitmap byte-based", "version": 7, "mbox": "http://patchwork.ozlabs.org/series/2770/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/813065/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813065/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx05.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 3xsGx70F7pz9sNw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 06:44:11 +1000 (AEST)", "from localhost ([::1]:38507 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 1drs2T-0006LZ-1Z\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 16:44:09 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:39794)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqv-00028c-SE\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:32:14 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqu-0006Qj-UM\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:32:13 -0400", "from mx1.redhat.com ([209.132.183.28]:47450)\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 1drrqr-0006Ki-A7; Tue, 12 Sep 2017 16:32:09 -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 46B2251B;\n\tTue, 12 Sep 2017 20:32:08 +0000 (UTC)", "from red.redhat.com (ovpn-120-44.rdu2.redhat.com [10.10.120.44])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 0931860461;\n\tTue, 12 Sep 2017 20:32:06 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 46B2251B", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 15:31:15 -0500", "Message-Id": "<20170912203119.24166-17-eblake@redhat.com>", "In-Reply-To": "<20170912203119.24166-1-eblake@redhat.com>", "References": "<20170912203119.24166-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.29]);\n\tTue, 12 Sep 2017 20:32:08 +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 v7 16/20] qcow2: Switch qcow2_measure() to\n\tbyte-based iteration", "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, vsementsov@virtuozzo.com, jsnow@redhat.com,\n\tqemu-block@nongnu.org, Max Reitz <mreitz@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": "This is new code, but it is easier to read if it makes passes over\nthe image using bytes rather than sectors (and will get easier in\nthe future when bdrv_get_block_status is converted to byte-based).\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\nReviewed-by: John Snow <jsnow@redhat.com>\n\n---\nv7: tweak constant given to MIN (no semantic change, R-b kept) [Kevin]\nv6: separate bug fix to earlier patch\nv5: new patch\n---\n block/qcow2.c | 22 ++++++++++------------\n 1 file changed, 10 insertions(+), 12 deletions(-)", "diff": "diff --git a/block/qcow2.c b/block/qcow2.c\nindex bae5893327..64dcd98a91 100644\n--- a/block/qcow2.c\n+++ b/block/qcow2.c\n@@ -3647,20 +3647,19 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,\n */\n required = virtual_size;\n } else {\n- int cluster_sectors = cluster_size / BDRV_SECTOR_SIZE;\n- int64_t sector_num;\n+ int64_t offset;\n int pnum = 0;\n\n- for (sector_num = 0;\n- sector_num < ssize / BDRV_SECTOR_SIZE;\n- sector_num += pnum) {\n- int nb_sectors = MIN(ssize / BDRV_SECTOR_SIZE - sector_num,\n- BDRV_REQUEST_MAX_SECTORS);\n+ for (offset = 0; offset < ssize;\n+ offset += pnum * BDRV_SECTOR_SIZE) {\n+ int nb_sectors = MIN(ssize - offset,\n+ BDRV_REQUEST_MAX_BYTES) / BDRV_SECTOR_SIZE;\n BlockDriverState *file;\n int64_t ret;\n\n ret = bdrv_get_block_status_above(in_bs, NULL,\n- sector_num, nb_sectors,\n+ offset >> BDRV_SECTOR_BITS,\n+ nb_sectors,\n &pnum, &file);\n if (ret < 0) {\n error_setg_errno(&local_err, -ret,\n@@ -3673,12 +3672,11 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,\n } else if ((ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED)) ==\n (BDRV_BLOCK_DATA | BDRV_BLOCK_ALLOCATED)) {\n /* Extend pnum to end of cluster for next iteration */\n- pnum = ROUND_UP(sector_num + pnum, cluster_sectors) -\n- sector_num;\n+ pnum = (ROUND_UP(offset + pnum * BDRV_SECTOR_SIZE,\n+ cluster_size) - offset) >> BDRV_SECTOR_BITS;\n\n /* Count clusters we've seen */\n- required += (sector_num % cluster_sectors + pnum) *\n- BDRV_SECTOR_SIZE;\n+ required += offset % cluster_size + pnum * BDRV_SECTOR_SIZE;\n }\n }\n }\n", "prefixes": [ "v7", "16/20" ] }