{"id":807899,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807899/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","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":""},"msgid":"<20170830210542.2153-17-eblake@redhat.com>","date":"2017-08-30T21:05:40","name":"[v6,16/18] qcow2: Switch store_bitmap_data() to byte-based iteration","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0a7deac58dea746673b9c353e361748a98cf4056","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830210542.2153-17-eblake@redhat.com/mbox/","series":[{"id":700,"url":"http://patchwork.ozlabs.org/api/1.0/series/700/?format=json","date":"2017-08-30T21:05:25","name":"make dirty-bitmap byte-based","version":6,"mbox":"http://patchwork.ozlabs.org/series/700/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807899/checks/","tags":{},"headers":{"Return-Path":"","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=)","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=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 3xjJBN1tQZz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 07:13:00 +1000 (AEST)","from localhost ([::1]:52719 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAIE-0001B3-9f\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:12:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37181)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnAC2-0004Bj-TI\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnAC1-0007kg-J0\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:34 -0400","from mx1.redhat.com ([209.132.183.28]:47362)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dnABz-0007jU-5q; Wed, 30 Aug 2017 17:06:31 -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 3B9C35F795;\n\tWed, 30 Aug 2017 21:06:30 +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 000F077557;\n\tWed, 30 Aug 2017 21:06:27 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3B9C35F795","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:40 -0500","Message-Id":"<20170830210542.2153-17-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.39]);\n\tWed, 30 Aug 2017 21:06:30 +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 16/18] qcow2: Switch store_bitmap_data() to\n\tbyte-based iteration","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, vsementsov@virtuozzo.com, jsnow@redhat.com,\n\tqemu-block@nongnu.org, Max Reitz ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"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 \nReviewed-by: John Snow \nReviewed-by: Vladimir Sementsov-Ogievskiy \n\n---\nv5: no change\nv4: new patch\n---\n block/qcow2-bitmap.c | 26 +++++++++++---------------\n 1 file changed, 11 insertions(+), 15 deletions(-)","diff":"diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex b807298484..63d845e35f 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -1072,10 +1072,9 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n {\n int ret;\n BDRVQcow2State *s = bs->opaque;\n- int64_t sector;\n- uint64_t limit, sbc;\n+ int64_t offset;\n+ uint64_t 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 const char *bm_name = bdrv_dirty_bitmap_name(bitmap);\n uint8_t *buf = NULL;\n BdrvDirtyBitmapIter *dbi;\n@@ -1100,18 +1099,17 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n dbi = bdrv_dirty_iter_new(bitmap);\n buf = g_malloc(s->cluster_size);\n limit = bytes_covered_by_bitmap_cluster(s, bitmap);\n- sbc = limit >> BDRV_SECTOR_BITS;\n assert(DIV_ROUND_UP(bm_size, limit) == tb_size);\n\n- while ((sector = bdrv_dirty_iter_next(dbi) >> BDRV_SECTOR_BITS) != -1) {\n- uint64_t cluster = sector / sbc;\n+ while ((offset = bdrv_dirty_iter_next(dbi)) != -1) {\n+ uint64_t cluster = offset / limit;\n uint64_t end, write_size;\n int64_t off;\n\n- sector = cluster * sbc;\n- end = MIN(bm_sectors, sector + sbc);\n- write_size = bdrv_dirty_bitmap_serialization_size(bitmap,\n- sector * BDRV_SECTOR_SIZE, (end - sector) * BDRV_SECTOR_SIZE);\n+ offset = cluster * limit;\n+ end = MIN(bm_size, offset + limit);\n+ write_size = bdrv_dirty_bitmap_serialization_size(bitmap, offset,\n+ end - offset);\n assert(write_size <= s->cluster_size);\n\n off = qcow2_alloc_clusters(bs, s->cluster_size);\n@@ -1123,9 +1121,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n }\n tb[cluster] = off;\n\n- bdrv_dirty_bitmap_serialize_part(bitmap, buf,\n- sector * BDRV_SECTOR_SIZE,\n- (end - sector) * BDRV_SECTOR_SIZE);\n+ bdrv_dirty_bitmap_serialize_part(bitmap, buf, offset, end - offset);\n if (write_size < s->cluster_size) {\n memset(buf + write_size, 0, s->cluster_size - write_size);\n }\n@@ -1143,11 +1139,11 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n goto fail;\n }\n\n- if (end >= bm_sectors) {\n+ if (end >= bm_size) {\n break;\n }\n\n- bdrv_set_dirty_iter(dbi, end * BDRV_SECTOR_SIZE);\n+ bdrv_set_dirty_iter(dbi, end);\n }\n\n *bitmap_table_size = tb_size;\n","prefixes":["v6","16/18"]}