Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/813053/?format=api
{ "id": 813053, "url": "http://patchwork.ozlabs.org/api/patches/813053/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20170912203119.24166-7-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-7-eblake@redhat.com>", "list_archive_url": null, "date": "2017-09-12T20:31:05", "name": "[v7,06/20] dirty-bitmap: Change bdrv_dirty_bitmap_size() to report bytes", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "cf3bf930132d8845cd6ace479c1edbf13d9421d4", "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-7-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/813053/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/813053/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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com", "ext-mx08.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 3xsGlN5vW7z9sNw\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 13 Sep 2017 06:35:44 +1000 (AEST)", "from localhost ([::1]:38453 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 1drruI-0005BF-Sd\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 16:35:42 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:39360)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqP-0001eN-VZ\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:31:43 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <eblake@redhat.com>) id 1drrqO-0005bE-RV\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 16:31:41 -0400", "from mx1.redhat.com ([209.132.183.28]:57726)\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 1drrqM-0005Wa-8G; Tue, 12 Sep 2017 16:31:38 -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 4E927C0587DD;\n\tTue, 12 Sep 2017 20:31:37 +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 151D05C6D7;\n\tTue, 12 Sep 2017 20:31:35 +0000 (UTC)" ], "DMARC-Filter": "OpenDMARC Filter v1.3.2 mx1.redhat.com 4E927C0587DD", "From": "Eric Blake <eblake@redhat.com>", "To": "qemu-devel@nongnu.org", "Date": "Tue, 12 Sep 2017 15:31:05 -0500", "Message-Id": "<20170912203119.24166-7-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.32]);\n\tTue, 12 Sep 2017 20:31:37 +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 06/20] dirty-bitmap: Change\n\tbdrv_dirty_bitmap_size() to report bytes", "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, Fam Zheng <famz@redhat.com>, \n\tqemu-block@nongnu.org, Max Reitz <mreitz@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're already reporting bytes for bdrv_dirty_bitmap_granularity();\nmixing bytes and sectors in our return values is a recipe for\nconfusion. A later cleanup will convert dirty bitmap internals\nto be entirely byte-based, but in the meantime, we should report\nthe bitmap size in bytes.\n\nThe only external caller in qcow2-bitmap.c is temporarily more verbose\n(because it is still using sector-based math), but will later be\nswitched to track progress by bytes instead of sectors.\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\n\n---\nv7: split external from internal change [Kevin], drop R-b\nv6: no change\nv5: fix bdrv_dirty_bitmap_truncate [John], drop R-b\nv4: retitle from \"Track size in bytes\", rebase to persistent bitmaps,\nround up when converting bytes to sectors\nv3: no change\nv2: tweak commit message, no code change\n---\n block/dirty-bitmap.c | 2 +-\n block/qcow2-bitmap.c | 14 ++++++++------\n 2 files changed, 9 insertions(+), 7 deletions(-)", "diff": "diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c\nindex 52f7a399b2..56a01699e9 100644\n--- a/block/dirty-bitmap.c\n+++ b/block/dirty-bitmap.c\n@@ -175,7 +175,7 @@ void bdrv_release_meta_dirty_bitmap(BdrvDirtyBitmap *bitmap)\n\n int64_t bdrv_dirty_bitmap_size(const BdrvDirtyBitmap *bitmap)\n {\n- return bitmap->size;\n+ return bitmap->size * BDRV_SECTOR_SIZE;\n }\n\n const char *bdrv_dirty_bitmap_name(const BdrvDirtyBitmap *bitmap)\ndiff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex b3ee4c794a..65122e9ae1 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -295,10 +295,11 @@ static int load_bitmap_data(BlockDriverState *bs,\n BDRVQcow2State *s = bs->opaque;\n uint64_t sector, sbc;\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- bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_size));\n+ bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_sectors));\n\n if (tab_size != bitmap_table_size || tab_size > BME_MAX_TABLE_SIZE) {\n return -EINVAL;\n@@ -307,7 +308,7 @@ static int load_bitmap_data(BlockDriverState *bs,\n buf = g_malloc(s->cluster_size);\n sbc = sectors_covered_by_bitmap_cluster(s, bitmap);\n for (i = 0, sector = 0; i < tab_size; ++i, sector += sbc) {\n- uint64_t count = MIN(bm_size - sector, sbc);\n+ uint64_t count = MIN(bm_sectors - sector, sbc);\n uint64_t entry = bitmap_table[i];\n uint64_t offset = entry & BME_TABLE_ENTRY_OFFSET_MASK;\n\n@@ -1077,13 +1078,14 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n int64_t sector;\n uint64_t sbc;\n uint64_t bm_size = bdrv_dirty_bitmap_size(bitmap);\n+ uint64_t bm_sectors = DIV_ROUND_UP(bm_size, BDRV_SECTOR_SIZE);\n const char *bm_name = bdrv_dirty_bitmap_name(bitmap);\n uint8_t *buf = NULL;\n BdrvDirtyBitmapIter *dbi;\n uint64_t *tb;\n uint64_t tb_size =\n size_to_clusters(s,\n- bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_size));\n+ bdrv_dirty_bitmap_serialization_size(bitmap, 0, bm_sectors));\n\n if (tb_size > BME_MAX_TABLE_SIZE ||\n tb_size * s->cluster_size > BME_MAX_PHYS_SIZE)\n@@ -1101,7 +1103,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n dbi = bdrv_dirty_iter_new(bitmap, 0);\n buf = g_malloc(s->cluster_size);\n sbc = sectors_covered_by_bitmap_cluster(s, bitmap);\n- assert(DIV_ROUND_UP(bm_size, sbc) == tb_size);\n+ assert(DIV_ROUND_UP(bm_sectors, sbc) == tb_size);\n\n while ((sector = bdrv_dirty_iter_next(dbi)) != -1) {\n uint64_t cluster = sector / sbc;\n@@ -1109,7 +1111,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n int64_t off;\n\n sector = cluster * sbc;\n- end = MIN(bm_size, sector + sbc);\n+ end = MIN(bm_sectors, sector + sbc);\n write_size =\n bdrv_dirty_bitmap_serialization_size(bitmap, sector, end - sector);\n assert(write_size <= s->cluster_size);\n@@ -1141,7 +1143,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n goto fail;\n }\n\n- if (end >= bm_size) {\n+ if (end >= bm_sectors) {\n break;\n }\n\n", "prefixes": [ "v7", "06/20" ] }