{"id":807895,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807895/?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-8-eblake@redhat.com>","date":"2017-08-30T21:05:31","name":"[v6,07/18] qcow2: Switch sectors_covered_by_bitmap_cluster() to byte-based","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"12d6e8beffc1dc089654e11422e35f17d92ea1e0","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-8-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/807895/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 3xjJ6p4VXyz9s8P\n\tfor ;\n\tThu, 31 Aug 2017 07:09:54 +1000 (AEST)","from localhost ([::1]:52700 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnAFE-0006Dd-KN\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 17:09:52 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:36917)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnABY-0003kL-M0\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:05 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnABX-0007UB-Ot\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 17:06:04 -0400","from mx1.redhat.com ([209.132.183.28]:46472)\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 1dnABV-0007RJ-5u; Wed, 30 Aug 2017 17:06:01 -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 358965F798;\n\tWed, 30 Aug 2017 21:06:00 +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 4525A77557;\n\tWed, 30 Aug 2017 21:05:59 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 358965F798","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:05:31 -0500","Message-Id":"<20170830210542.2153-8-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:00 +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 07/18] qcow2: Switch\n\tsectors_covered_by_bitmap_cluster() to byte-based","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":"We are gradually converting to byte-based interfaces, as they are\neasier to reason about than sector-based. Change the qcow2 bitmap\nhelper function sectors_covered_by_bitmap_cluster(), renaming it\nto bytes_covered_by_bitmap_cluster() in the process.\n\nSigned-off-by: Eric Blake \nReviewed-by: John Snow \n\n---\nv5: no change\nv4: new patch\n---\n block/qcow2-bitmap.c | 28 ++++++++++++++--------------\n 1 file changed, 14 insertions(+), 14 deletions(-)","diff":"diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c\nindex 92098bfa49..4475273d8c 100644\n--- a/block/qcow2-bitmap.c\n+++ b/block/qcow2-bitmap.c\n@@ -269,18 +269,16 @@ static int free_bitmap_clusters(BlockDriverState *bs, Qcow2BitmapTable *tb)\n return 0;\n }\n\n-/* This function returns the number of disk sectors covered by a single qcow2\n- * cluster of bitmap data. */\n-static uint64_t sectors_covered_by_bitmap_cluster(const BDRVQcow2State *s,\n- const BdrvDirtyBitmap *bitmap)\n+/* Return the disk size covered by a single qcow2 cluster of bitmap data. */\n+static uint64_t bytes_covered_by_bitmap_cluster(const BDRVQcow2State *s,\n+ const BdrvDirtyBitmap *bitmap)\n {\n- uint64_t sector_granularity =\n- bdrv_dirty_bitmap_granularity(bitmap) >> BDRV_SECTOR_BITS;\n- uint64_t sbc = sector_granularity * (s->cluster_size << 3);\n+ uint64_t granularity = bdrv_dirty_bitmap_granularity(bitmap);\n+ uint64_t limit = granularity * (s->cluster_size << 3);\n\n- assert(QEMU_IS_ALIGNED(sbc << BDRV_SECTOR_BITS,\n+ assert(QEMU_IS_ALIGNED(limit,\n bdrv_dirty_bitmap_serialization_align(bitmap)));\n- return sbc;\n+ return limit;\n }\n\n /* load_bitmap_data\n@@ -293,7 +291,7 @@ static int load_bitmap_data(BlockDriverState *bs,\n {\n int ret = 0;\n BDRVQcow2State *s = bs->opaque;\n- uint64_t sector, sbc;\n+ uint64_t sector, limit, 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@@ -306,7 +304,8 @@ static int load_bitmap_data(BlockDriverState *bs,\n }\n\n buf = g_malloc(s->cluster_size);\n- sbc = sectors_covered_by_bitmap_cluster(s, bitmap);\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 uint64_t entry = bitmap_table[i];\n@@ -1080,7 +1079,7 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n int ret;\n BDRVQcow2State *s = bs->opaque;\n int64_t sector;\n- uint64_t sbc;\n+ uint64_t limit, 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@@ -1106,8 +1105,9 @@ static uint64_t *store_bitmap_data(BlockDriverState *bs,\n\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_sectors, sbc) == tb_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)) != -1) {\n uint64_t cluster = sector / sbc;\n","prefixes":["v6","07/18"]}