{"id":813512,"url":"http://patchwork.ozlabs.org/api/patches/813512/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-7-eblake@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"<20170913160333.23622-7-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-13T16:03:16","name":"[v4,06/23] qemu-img: Switch get_block_status() to byte-based","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a7ece495d96dcba5962ab0b23ccc11147bdc8f47","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-7-eblake@redhat.com/mbox/","series":[{"id":2944,"url":"http://patchwork.ozlabs.org/api/series/2944/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2944","date":"2017-09-13T16:03:10","name":"make bdrv_get_block_status byte-based","version":4,"mbox":"http://patchwork.ozlabs.org/series/2944/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813512/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813512/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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xsmrk5mQ0z9sPk\n\tfor ;\n\tThu, 14 Sep 2017 02:12:06 +1000 (AEST)","from localhost ([::1]:43351 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsACu-0005Kh-Tv\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 12:08:09 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45657)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsA99-0001Lk-Pb\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:16 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsA98-00062A-Nw\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:15 -0400","from mx1.redhat.com ([209.132.183.28]:56164)\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 1dsA94-0005x0-59; Wed, 13 Sep 2017 12:04:10 -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 3C92CC047B8C;\n\tWed, 13 Sep 2017 16:04:09 +0000 (UTC)","from red.redhat.com (ovpn-120-201.rdu2.redhat.com [10.10.120.201])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7A9365C47C;\n\tWed, 13 Sep 2017 16:04:03 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 3C92CC047B8C","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 11:03:16 -0500","Message-Id":"<20170913160333.23622-7-eblake@redhat.com>","In-Reply-To":"<20170913160333.23622-1-eblake@redhat.com>","References":"<20170913160333.23622-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.31]);\n\tWed, 13 Sep 2017 16:04:09 +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 v4 06/23] qemu-img: Switch get_block_status()\n\tto 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, jsnow@redhat.com, famz@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. Continue by converting\nan internal function (no semantic change), and simplifying its\ncaller accordingly.\n\nSigned-off-by: Eric Blake \nReviewed-by: Fam Zheng \n---\nv2-v3: no change\n---\n qemu-img.c | 24 +++++++++++-------------\n 1 file changed, 11 insertions(+), 13 deletions(-)","diff":"diff --git a/qemu-img.c b/qemu-img.c\nindex 0c12e1c240..54f7682069 100644\n--- a/qemu-img.c\n+++ b/qemu-img.c\n@@ -2670,14 +2670,16 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e,\n }\n }\n\n-static int get_block_status(BlockDriverState *bs, int64_t sector_num,\n- int nb_sectors, MapEntry *e)\n+static int get_block_status(BlockDriverState *bs, int64_t offset,\n+ int64_t bytes, MapEntry *e)\n {\n int64_t ret;\n int depth;\n BlockDriverState *file;\n bool has_offset;\n+ int nb_sectors = bytes >> BDRV_SECTOR_BITS;\n\n+ assert(bytes < INT_MAX);\n /* As an optimization, we could cache the current range of unallocated\n * clusters in each file of the chain, and avoid querying the same\n * range repeatedly.\n@@ -2685,8 +2687,8 @@ static int get_block_status(BlockDriverState *bs, int64_t sector_num,\n\n depth = 0;\n for (;;) {\n- ret = bdrv_get_block_status(bs, sector_num, nb_sectors, &nb_sectors,\n- &file);\n+ ret = bdrv_get_block_status(bs, offset >> BDRV_SECTOR_BITS, nb_sectors,\n+ &nb_sectors, &file);\n if (ret < 0) {\n return ret;\n }\n@@ -2706,7 +2708,7 @@ static int get_block_status(BlockDriverState *bs, int64_t sector_num,\n has_offset = !!(ret & BDRV_BLOCK_OFFSET_VALID);\n\n *e = (MapEntry) {\n- .start = sector_num * BDRV_SECTOR_SIZE,\n+ .start = offset,\n .length = nb_sectors * BDRV_SECTOR_SIZE,\n .data = !!(ret & BDRV_BLOCK_DATA),\n .zero = !!(ret & BDRV_BLOCK_ZERO),\n@@ -2836,16 +2838,12 @@ static int img_map(int argc, char **argv)\n\n length = blk_getlength(blk);\n while (curr.start + curr.length < length) {\n- int64_t nsectors_left;\n- int64_t sector_num;\n- int n;\n-\n- sector_num = (curr.start + curr.length) >> BDRV_SECTOR_BITS;\n+ int64_t offset = curr.start + curr.length;\n+ int64_t n;\n\n /* Probe up to 1 GiB at a time. */\n- nsectors_left = DIV_ROUND_UP(length, BDRV_SECTOR_SIZE) - sector_num;\n- n = MIN(1 << (30 - BDRV_SECTOR_BITS), nsectors_left);\n- ret = get_block_status(bs, sector_num, n, &next);\n+ n = QEMU_ALIGN_DOWN(MIN(1 << 30, length - offset), BDRV_SECTOR_SIZE);\n+ ret = get_block_status(bs, offset, n, &next);\n\n if (ret < 0) {\n error_report(\"Could not read file metadata: %s\", strerror(-ret));\n","prefixes":["v4","06/23"]}