{"id":815107,"url":"http://patchwork.ozlabs.org/api/1.2/patches/815107/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-17-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918185819.5984-17-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-18T18:58:15","name":"[v8,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/1.2/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918185819.5984-17-eblake@redhat.com/mbox/","series":[{"id":3711,"url":"http://patchwork.ozlabs.org/api/1.2/series/3711/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3711","date":"2017-09-18T18:58:00","name":"make dirty-bitmap byte-based","version":8,"mbox":"http://patchwork.ozlabs.org/series/3711/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815107/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815107/checks/","tags":{},"related":[],"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-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 3xwwZ80Vnxz9rxm\n\tfor ;\n\tTue, 19 Sep 2017 05:10:24 +1000 (AEST)","from localhost ([::1]:38419 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1du1Qw-0004dQ-4G\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 15:10:18 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44547)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1du1GF-0002aM-2o\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:16 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1du1GE-0006hn-32\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 14:59:15 -0400","from mx1.redhat.com ([209.132.183.28]:51484)\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 1du1GB-0006fG-Ik; Mon, 18 Sep 2017 14:59:11 -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 7DA4946287;\n\tMon, 18 Sep 2017 18:59:10 +0000 (UTC)","from red.redhat.com (ovpn-124-97.rdu2.redhat.com [10.10.124.97])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 648515C1A3;\n\tMon, 18 Sep 2017 18:59:09 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7DA4946287","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 13:58:15 -0500","Message-Id":"<20170918185819.5984-17-eblake@redhat.com>","In-Reply-To":"<20170918185819.5984-1-eblake@redhat.com>","References":"<20170918185819.5984-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.29]);\n\tMon, 18 Sep 2017 18:59:10 +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 v8 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":"","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":"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 \nReviewed-by: John Snow \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":["v8","16/20"]}