Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807902/?format=api
{ "id": 807902, "url": "http://patchwork.ozlabs.org/api/patches/807902/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830210542.2153-16-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": "<20170830210542.2153-16-eblake@redhat.com>", "list_archive_url": null, "date": "2017-08-30T21:05:39", "name": "[v6,15/18] qcow2: Switch load_bitmap_data() to byte-based iteration", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "d483b1918f9dda451b79e3d5bc6091aa9dc9987b", "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/20170830210542.2153-16-eblake@redhat.com/mbox/", "series": [ { "id": 700, "url": "http://patchwork.ozlabs.org/api/series/700/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=700", "date": "2017-08-30T21:05:25", "name": "make dirty-bitmap byte-based", "version": 6, "mbox": "http://patchwork.ozlabs.org/series/700/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/807902/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807902/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-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx03.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 3xjJDt1thwz9sP5\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 07:15:10 +1000 (AEST)", "from localhost ([::1]:52734 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 1dnAKK-00034I-9U\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:15:08 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:37165)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dnAC0-00049Y-Q1\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:33 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1dnABz-0007jz-QH\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:32 -0400", "from mx1.redhat.com ([209.132.183.28]:35026)\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 1dnABw-0007ij-NQ; Wed, 30 Aug 2017 17:06:28 -0400", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 BABA87EBD6;\n\tWed, 30 Aug 2017 21:06:27 +0000 (UTC)", "from red.redhat.com (ovpn-122-186.rdu2.redhat.com [10.10.122.186])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id BA1279816B;\n\tWed, 30 Aug 2017 21:06:24 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com BABA87EBD6", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 30 Aug 2017 16:05:39 -0500", "Message-Id": "<20170830210542.2153-16-eblake@redhat.com>", "In-Reply-To": "<20170830210542.2153-1-eblake@redhat.com>", "References": "<20170830210542.2153-1-eblake@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tWed, 30 Aug 2017 21:06:27 +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 v6 15/18] qcow2: Switch load_bitmap_data() 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": "Now that we have adjusted the majority of the calls this function\nmakes to be byte-based, it is easier to read the code if it makes\npasses over the image using bytes rather than sectors.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\nReviewed-by: John Snow <jsnow@redhat.com>\nReviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>\n\n---\nv5: no change\nv4: new patch\n---\n block/qcow2-bitmap.c | 22 ++++++++--------------\n 1 file changed, 8 insertions(+), 14 deletions(-)", "diff": "diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex c7c60dfca2..b807298484 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -291,9 +291,8 @@ static int load_bitmap_data(BlockDriverState *bs,\n {\n int ret = 0;\n BDRVQcow2State *s = bs->opaque;\n- uint64_t sector, limit, sbc;\n+ uint64_t offset, limit;\n uint64_t bm_size = bdrv_dirty_bitmap_size(bitmap);\n- uint64_t bm_sectors = DIV_ROUND_UP(bm_size, BDRV_SECTOR_SIZE);\n uint8_t *buf = NULL;\n uint64_t i, tab_size =\n size_to_clusters(s,\n@@ -305,32 +304,27 @@ static int load_bitmap_data(BlockDriverState *bs,\n\n buf = g_malloc(s->cluster_size);\n limit = bytes_covered_by_bitmap_cluster(s, bitmap);\n- sbc = limit >> BDRV_SECTOR_BITS;\n- for (i = 0, sector = 0; i < tab_size; ++i, sector += sbc) {\n- uint64_t count = MIN(bm_sectors - sector, sbc);\n+ for (i = 0, offset = 0; i < tab_size; ++i, offset += limit) {\n+ uint64_t count = MIN(bm_size - offset, limit);\n uint64_t entry = bitmap_table[i];\n- uint64_t offset = entry & BME_TABLE_ENTRY_OFFSET_MASK;\n+ uint64_t data_offset = entry & BME_TABLE_ENTRY_OFFSET_MASK;\n\n assert(check_table_entry(entry, s->cluster_size) == 0);\n\n- if (offset == 0) {\n+ if (data_offset == 0) {\n if (entry & BME_TABLE_ENTRY_FLAG_ALL_ONES) {\n- bdrv_dirty_bitmap_deserialize_ones(bitmap,\n- sector * BDRV_SECTOR_SIZE,\n- count * BDRV_SECTOR_SIZE,\n+ bdrv_dirty_bitmap_deserialize_ones(bitmap, offset, count,\n false);\n } else {\n /* No need to deserialize zeros because the dirty bitmap is\n * already cleared */\n }\n } else {\n- ret = bdrv_pread(bs->file, offset, buf, s->cluster_size);\n+ ret = bdrv_pread(bs->file, data_offset, buf, s->cluster_size);\n if (ret < 0) {\n goto finish;\n }\n- bdrv_dirty_bitmap_deserialize_part(bitmap, buf,\n- sector * BDRV_SECTOR_SIZE,\n- count * BDRV_SECTOR_SIZE,\n+ bdrv_dirty_bitmap_deserialize_part(bitmap, buf, offset, count,\n false);\n }\n }\n", "prefixes": [ "v6", "15/18" ] }