From nobody Tue Apr 15 09:54:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509025236440697.1510522760989; Thu, 26 Oct 2017 06:40:36 -0700 (PDT) Received: from localhost ([::1]:52975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7iOT-0001jC-Gp for importer@patchew.org; Thu, 26 Oct 2017 09:40:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7i3f-0000rQ-Py for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7i3d-0002M6-Ov for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7i3V-0002F7-Ce; Thu, 26 Oct 2017 09:18:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 83CDFC059B6F; Thu, 26 Oct 2017 13:18:40 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3407C7F5FF; Thu, 26 Oct 2017 13:18:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 83CDFC059B6F Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kwolf@redhat.com From: Kevin Wolf To: qemu-block@nongnu.org Date: Thu, 26 Oct 2017 15:17:28 +0200 Message-Id: <20171026131741.5059-23-kwolf@redhat.com> In-Reply-To: <20171026131741.5059-1-kwolf@redhat.com> References: <20171026131741.5059-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 26 Oct 2017 13:18:40 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 22/35] qemu-img: Change img_compare() to be byte-based X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake In the continuing quest to make more things byte-based, change the internal iteration of img_compare(). We can finally drop the TODO assertions added earlier, now that the entire algorithm is byte-based and no longer has to shift from bytes to sectors. Most of the change is mechanical ('total_sectors' becomes 'total_size', 'sector_num' becomes 'offset', 'nb_sectors' becomes 'chunk', 'progress_base' goes from sectors to bytes); some of it is also a cleanup (sectors_to_bytes() is now unused, loss of variable 'count' added earlier in commit 51b0a488). Signed-off-by: Eric Blake Reviewed-by: John Snow Signed-off-by: Kevin Wolf --- qemu-img.c | 124 ++++++++++++++++++++++++---------------------------------= ---- 1 file changed, 48 insertions(+), 76 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 994365c6a4..02a6e27beb 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1186,11 +1186,6 @@ static int compare_buffers(const uint8_t *buf1, cons= t uint8_t *buf2, =20 #define IO_BUF_SIZE (2 * 1024 * 1024) =20 -static int64_t sectors_to_bytes(int64_t sectors) -{ - return sectors << BDRV_SECTOR_BITS; -} - /* * Check if passed sectors are empty (not allocated or contain only 0 byte= s) * @@ -1241,7 +1236,7 @@ static int img_compare(int argc, char **argv) const char *fmt1 =3D NULL, *fmt2 =3D NULL, *cache, *filename1, *filena= me2; BlockBackend *blk1, *blk2; BlockDriverState *bs1, *bs2; - int64_t total_sectors1, total_sectors2; + int64_t total_size1, total_size2; uint8_t *buf1 =3D NULL, *buf2 =3D NULL; int64_t pnum1, pnum2; int allocated1, allocated2; @@ -1249,9 +1244,9 @@ static int img_compare(int argc, char **argv) bool progress =3D false, quiet =3D false, strict =3D false; int flags; bool writethrough; - int64_t total_sectors; - int64_t sector_num =3D 0; - int64_t nb_sectors; + int64_t total_size; + int64_t offset =3D 0; + int64_t chunk; int c; uint64_t progress_base; bool image_opts =3D false; @@ -1365,39 +1360,37 @@ static int img_compare(int argc, char **argv) =20 buf1 =3D blk_blockalign(blk1, IO_BUF_SIZE); buf2 =3D blk_blockalign(blk2, IO_BUF_SIZE); - total_sectors1 =3D blk_nb_sectors(blk1); - if (total_sectors1 < 0) { + total_size1 =3D blk_getlength(blk1); + if (total_size1 < 0) { error_report("Can't get size of %s: %s", - filename1, strerror(-total_sectors1)); + filename1, strerror(-total_size1)); ret =3D 4; goto out; } - total_sectors2 =3D blk_nb_sectors(blk2); - if (total_sectors2 < 0) { + total_size2 =3D blk_getlength(blk2); + if (total_size2 < 0) { error_report("Can't get size of %s: %s", - filename2, strerror(-total_sectors2)); + filename2, strerror(-total_size2)); ret =3D 4; goto out; } - total_sectors =3D MIN(total_sectors1, total_sectors2); - progress_base =3D MAX(total_sectors1, total_sectors2); + total_size =3D MIN(total_size1, total_size2); + progress_base =3D MAX(total_size1, total_size2); =20 qemu_progress_print(0, 100); =20 - if (strict && total_sectors1 !=3D total_sectors2) { + if (strict && total_size1 !=3D total_size2) { ret =3D 1; qprintf(quiet, "Strict mode: Image size mismatch!\n"); goto out; } =20 - while (sector_num < total_sectors) { + while (offset < total_size) { int status1, status2; =20 - status1 =3D bdrv_block_status_above(bs1, NULL, - sector_num * BDRV_SECTOR_SIZE, - (total_sectors1 - sector_num) * - BDRV_SECTOR_SIZE, - &pnum1, NULL, NULL); + status1 =3D bdrv_block_status_above(bs1, NULL, offset, + total_size1 - offset, &pnum1, NU= LL, + NULL); if (status1 < 0) { ret =3D 3; error_report("Sector allocation test failed for %s", filename1= ); @@ -1405,30 +1398,24 @@ static int img_compare(int argc, char **argv) } allocated1 =3D status1 & BDRV_BLOCK_ALLOCATED; =20 - status2 =3D bdrv_block_status_above(bs2, NULL, - sector_num * BDRV_SECTOR_SIZE, - (total_sectors2 - sector_num) * - BDRV_SECTOR_SIZE, - &pnum2, NULL, NULL); + status2 =3D bdrv_block_status_above(bs2, NULL, offset, + total_size2 - offset, &pnum2, NU= LL, + NULL); if (status2 < 0) { ret =3D 3; error_report("Sector allocation test failed for %s", filename2= ); goto out; } allocated2 =3D status2 & BDRV_BLOCK_ALLOCATED; - /* TODO: Relax this once comparison is byte-based, and we no longer - * have to worry about sector alignment */ - assert(QEMU_IS_ALIGNED(pnum1 | pnum2, BDRV_SECTOR_SIZE)); =20 assert(pnum1 && pnum2); - nb_sectors =3D MIN(pnum1, pnum2) >> BDRV_SECTOR_BITS; + chunk =3D MIN(pnum1, pnum2); =20 if (strict) { if (status1 !=3D status2) { ret =3D 1; qprintf(quiet, "Strict mode: Offset %" PRId64 - " block status mismatch!\n", - sectors_to_bytes(sector_num)); + " block status mismatch!\n", offset); goto out; } } @@ -1438,59 +1425,54 @@ static int img_compare(int argc, char **argv) if (allocated1) { int64_t pnum; =20 - nb_sectors =3D MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_= BITS); - ret =3D blk_pread(blk1, sector_num << BDRV_SECTOR_BITS, bu= f1, - nb_sectors << BDRV_SECTOR_BITS); + chunk =3D MIN(chunk, IO_BUF_SIZE); + ret =3D blk_pread(blk1, offset, buf1, chunk); if (ret < 0) { - error_report("Error while reading offset %" PRId64 " o= f %s:" - " %s", sectors_to_bytes(sector_num), file= name1, - strerror(-ret)); + error_report("Error while reading offset %" PRId64 + " of %s: %s", + offset, filename1, strerror(-ret)); ret =3D 4; goto out; } - ret =3D blk_pread(blk2, sector_num << BDRV_SECTOR_BITS, bu= f2, - nb_sectors << BDRV_SECTOR_BITS); + ret =3D blk_pread(blk2, offset, buf2, chunk); if (ret < 0) { error_report("Error while reading offset %" PRId64 - " of %s: %s", sectors_to_bytes(sector_num= ), - filename2, strerror(-ret)); + " of %s: %s", + offset, filename2, strerror(-ret)); ret =3D 4; goto out; } - ret =3D compare_buffers(buf1, buf2, - nb_sectors * BDRV_SECTOR_SIZE, &pnum= ); - if (ret || pnum !=3D nb_sectors * BDRV_SECTOR_SIZE) { + ret =3D compare_buffers(buf1, buf2, chunk, &pnum); + if (ret || pnum !=3D chunk) { qprintf(quiet, "Content mismatch at offset %" PRId64 "= !\n", - sectors_to_bytes(sector_num) + (ret ? 0 : pnum= )); + offset + (ret ? 0 : pnum)); ret =3D 1; goto out; } } } else { - nb_sectors =3D MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_BITS= ); + chunk =3D MIN(chunk, IO_BUF_SIZE); if (allocated1) { - ret =3D check_empty_sectors(blk1, sector_num * BDRV_SECTOR= _SIZE, - nb_sectors * BDRV_SECTOR_SIZE, + ret =3D check_empty_sectors(blk1, offset, chunk, filename1, buf1, quiet); } else { - ret =3D check_empty_sectors(blk2, sector_num * BDRV_SECTOR= _SIZE, - nb_sectors * BDRV_SECTOR_SIZE, + ret =3D check_empty_sectors(blk2, offset, chunk, filename2, buf1, quiet); } if (ret) { goto out; } } - sector_num +=3D nb_sectors; - qemu_progress_print(((float) nb_sectors / progress_base)*100, 100); + offset +=3D chunk; + qemu_progress_print(((float) chunk / progress_base) * 100, 100); } =20 - if (total_sectors1 !=3D total_sectors2) { + if (total_size1 !=3D total_size2) { BlockBackend *blk_over; const char *filename_over; =20 qprintf(quiet, "Warning: Image size mismatch!\n"); - if (total_sectors1 > total_sectors2) { + if (total_size1 > total_size2) { blk_over =3D blk1; filename_over =3D filename1; } else { @@ -1498,14 +1480,10 @@ static int img_compare(int argc, char **argv) filename_over =3D filename2; } =20 - while (sector_num < progress_base) { - int64_t count; - - ret =3D bdrv_block_status_above(blk_bs(blk_over), NULL, - sector_num * BDRV_SECTOR_SIZE, - (progress_base - sector_num) * - BDRV_SECTOR_SIZE, - &count, NULL, NULL); + while (offset < progress_base) { + ret =3D bdrv_block_status_above(blk_bs(blk_over), NULL, offset, + progress_base - offset, &chunk, + NULL, NULL); if (ret < 0) { ret =3D 3; error_report("Sector allocation test failed for %s", @@ -1513,22 +1491,16 @@ static int img_compare(int argc, char **argv) goto out; =20 } - /* TODO relax this once bdrv_block_status_above does not enfor= ce - * sector alignment */ - assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)); - nb_sectors =3D count >> BDRV_SECTOR_BITS; if (ret & BDRV_BLOCK_ALLOCATED && !(ret & BDRV_BLOCK_ZERO)) { - nb_sectors =3D MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_= BITS); - ret =3D check_empty_sectors(blk_over, - sector_num * BDRV_SECTOR_SIZE, - nb_sectors * BDRV_SECTOR_SIZE, + chunk =3D MIN(chunk, IO_BUF_SIZE); + ret =3D check_empty_sectors(blk_over, offset, chunk, filename_over, buf1, quiet); if (ret) { goto out; } } - sector_num +=3D nb_sectors; - qemu_progress_print(((float) nb_sectors / progress_base)*100, = 100); + offset +=3D chunk; + qemu_progress_print(((float) chunk / progress_base) * 100, 100= ); } } =20 --=20 2.13.6