{"id":813532,"url":"http://patchwork.ozlabs.org/api/patches/813532/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913160333.23622-18-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-18-eblake@redhat.com>","list_archive_url":null,"date":"2017-09-13T16:03:27","name":"[v4,17/23] qemu-img: Change check_empty_sectors() to byte-based","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"34c149b15b8e82cfa36d7f7d4bf8de46cc99ef5d","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-18-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/813532/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813532/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-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3xsn9x5HP8z9sPk\n\tfor ;\n\tThu, 14 Sep 2017 02:27:01 +1000 (AEST)","from localhost ([::1]:43471 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dsAV9-0007gk-IK\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 12:26:59 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:46113)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dsA9k-00027B-MT\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:56 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dsA9j-0006Rz-QY\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 12:04:52 -0400","from mx1.redhat.com ([209.132.183.28]:36382)\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 1dsA9c-0006LO-De; Wed, 13 Sep 2017 12:04:44 -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 7202A81DFF;\n\tWed, 13 Sep 2017 16:04:43 +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 DCEDB19E72;\n\tWed, 13 Sep 2017 16:04:41 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 7202A81DFF","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 11:03:27 -0500","Message-Id":"<20170913160333.23622-18-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.25]);\n\tWed, 13 Sep 2017 16:04:43 +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 17/23] qemu-img: Change\n\tcheck_empty_sectors() 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, 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":"Continue on the quest to make more things byte-based instead of\nsector-based.\n\nSigned-off-by: Eric Blake \n\n---\nv3: new patch\n---\n qemu-img.c | 27 +++++++++++++++------------\n 1 file changed, 15 insertions(+), 12 deletions(-)","diff":"diff --git a/qemu-img.c b/qemu-img.c\nindex 3e1e373e8f..2e05f92e85 100644\n--- a/qemu-img.c\n+++ b/qemu-img.c\n@@ -1202,30 +1202,29 @@ static int64_t sectors_to_bytes(int64_t sectors)\n * an error message.\n *\n * @param blk: BlockBackend for the image\n- * @param sect_num: Number of first sector to check\n- * @param sect_count: Number of sectors to check\n+ * @param offset: Starting offset to check\n+ * @param bytes: Number of bytes to check\n * @param filename: Name of disk file we are checking (logging purpose)\n * @param buffer: Allocated buffer for storing read data\n * @param quiet: Flag for quiet mode\n */\n-static int check_empty_sectors(BlockBackend *blk, int64_t sect_num,\n- int sect_count, const char *filename,\n+static int check_empty_sectors(BlockBackend *blk, int64_t offset,\n+ int64_t bytes, const char *filename,\n uint8_t *buffer, bool quiet)\n {\n int ret = 0;\n int64_t idx;\n\n- ret = blk_pread(blk, sect_num << BDRV_SECTOR_BITS, buffer,\n- sect_count << BDRV_SECTOR_BITS);\n+ ret = blk_pread(blk, offset, buffer, bytes);\n if (ret < 0) {\n error_report(\"Error while reading offset %\" PRId64 \" of %s: %s\",\n- sectors_to_bytes(sect_num), filename, strerror(-ret));\n+ offset, filename, strerror(-ret));\n return 4;\n }\n- idx = find_nonzero(buffer, sect_count * BDRV_SECTOR_SIZE);\n+ idx = find_nonzero(buffer, bytes);\n if (idx >= 0) {\n qprintf(quiet, \"Content mismatch at offset %\" PRId64 \"!\\n\",\n- sectors_to_bytes(sect_num) + idx);\n+ offset + idx);\n return 1;\n }\n\n@@ -1468,10 +1467,12 @@ static int img_compare(int argc, char **argv)\n } else {\n nb_sectors = MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_BITS);\n if (allocated1) {\n- ret = check_empty_sectors(blk1, sector_num, nb_sectors,\n+ ret = check_empty_sectors(blk1, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE,\n filename1, buf1, quiet);\n } else {\n- ret = check_empty_sectors(blk2, sector_num, nb_sectors,\n+ ret = check_empty_sectors(blk2, sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE,\n filename2, buf1, quiet);\n }\n if (ret) {\n@@ -1516,7 +1517,9 @@ static int img_compare(int argc, char **argv)\n nb_sectors = count >> BDRV_SECTOR_BITS;\n if (ret & BDRV_BLOCK_ALLOCATED && !(ret & BDRV_BLOCK_ZERO)) {\n nb_sectors = MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_BITS);\n- ret = check_empty_sectors(blk_over, sector_num, nb_sectors,\n+ ret = check_empty_sectors(blk_over,\n+ sector_num * BDRV_SECTOR_SIZE,\n+ nb_sectors * BDRV_SECTOR_SIZE,\n filename_over, buf1, quiet);\n if (ret) {\n goto out;\n","prefixes":["v4","17/23"]}