From nobody Tue Apr 15 09:54:06 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 150902454088883.18440886275755; Thu, 26 Oct 2017 06:29:00 -0700 (PDT) Received: from localhost ([::1]:52912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7iDP-0000Sw-1C for importer@patchew.org; Thu, 26 Oct 2017 09:28:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7i3J-0000a5-DD for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7i3G-00022m-3s for qemu-devel@nongnu.org; Thu, 26 Oct 2017 09:18:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43238) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e7i3D-0001yj-Hv; Thu, 26 Oct 2017 09:18:23 -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 A08332C977D; Thu, 26 Oct 2017 13:18:22 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.36.118.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE32A7F5F3; Thu, 26 Oct 2017 13:18:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A08332C977D Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.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:21 +0200 Message-Id: <20171026131741.5059-16-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.29]); Thu, 26 Oct 2017 13:18:22 +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 15/35] qemu-img: Simplify logic in img_compare() 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 As long as we are querying the status for a chunk smaller than the known image size, we are guaranteed that a successful return will have set pnum to a non-zero size (pnum is zero only for queries beyond the end of the file). Use that to slightly simplify the calculation of the current chunk size being compared. Likewise, we don't have to shrink the amount of data operated on until we know we have to read the file, and therefore have to fit in the bounds of our buffer. Also, note that 'total_sectors_over' is equivalent to 'progress_base'. With these changes in place, sectors_to_process() is now dead code, and can be removed. Signed-off-by: Eric Blake Signed-off-by: Kevin Wolf --- qemu-img.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 78c820e487..cfa28d41d5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1172,11 +1172,6 @@ static int64_t sectors_to_bytes(int64_t sectors) return sectors << BDRV_SECTOR_BITS; } =20 -static int64_t sectors_to_process(int64_t total, int64_t from) -{ - return MIN(total - from, IO_BUF_SIZE >> BDRV_SECTOR_BITS); -} - /* * Check if passed sectors are empty (not allocated or contain only 0 byte= s) * @@ -1373,13 +1368,9 @@ static int img_compare(int argc, char **argv) goto out; } =20 - for (;;) { + while (sector_num < total_sectors) { int status1, status2; =20 - nb_sectors =3D sectors_to_process(total_sectors, sector_num); - if (nb_sectors <=3D 0) { - break; - } status1 =3D bdrv_block_status_above(bs1, NULL, sector_num * BDRV_SECTOR_SIZE, (total_sectors1 - sector_num) * @@ -1406,12 +1397,9 @@ static int img_compare(int argc, char **argv) /* 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)); - if (pnum1) { - nb_sectors =3D MIN(nb_sectors, pnum1 >> BDRV_SECTOR_BITS); - } - if (pnum2) { - nb_sectors =3D MIN(nb_sectors, pnum2 >> BDRV_SECTOR_BITS); - } + + assert(pnum1 && pnum2); + nb_sectors =3D MIN(pnum1, pnum2) >> BDRV_SECTOR_BITS; =20 if (strict) { if (status1 !=3D status2) { @@ -1423,9 +1411,10 @@ static int img_compare(int argc, char **argv) } } if ((status1 & BDRV_BLOCK_ZERO) && (status2 & BDRV_BLOCK_ZERO)) { - nb_sectors =3D DIV_ROUND_UP(MIN(pnum1, pnum2), BDRV_SECTOR_SIZ= E); + /* nothing to do */ } else if (allocated1 =3D=3D allocated2) { if (allocated1) { + 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); if (ret < 0) { @@ -1454,7 +1443,7 @@ static int img_compare(int argc, char **argv) } } } else { - + nb_sectors =3D MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_BITS= ); if (allocated1) { ret =3D check_empty_sectors(blk1, sector_num, nb_sectors, filename1, buf1, quiet); @@ -1477,30 +1466,24 @@ static int img_compare(int argc, char **argv) =20 if (total_sectors1 !=3D total_sectors2) { BlockBackend *blk_over; - int64_t total_sectors_over; const char *filename_over; =20 qprintf(quiet, "Warning: Image size mismatch!\n"); if (total_sectors1 > total_sectors2) { - total_sectors_over =3D total_sectors1; blk_over =3D blk1; filename_over =3D filename1; } else { - total_sectors_over =3D total_sectors2; blk_over =3D blk2; filename_over =3D filename2; } =20 - for (;;) { + while (sector_num < progress_base) { int64_t count; =20 - nb_sectors =3D sectors_to_process(total_sectors_over, sector_n= um); - if (nb_sectors <=3D 0) { - break; - } ret =3D bdrv_is_allocated_above(blk_bs(blk_over), NULL, sector_num * BDRV_SECTOR_SIZE, - nb_sectors * BDRV_SECTOR_SIZE, + (progress_base - sector_num) * + BDRV_SECTOR_SIZE, &count); if (ret < 0) { ret =3D 3; @@ -1514,6 +1497,7 @@ static int img_compare(int argc, char **argv) assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE)); nb_sectors =3D count >> BDRV_SECTOR_BITS; if (ret) { + nb_sectors =3D MIN(nb_sectors, IO_BUF_SIZE >> BDRV_SECTOR_= BITS); ret =3D check_empty_sectors(blk_over, sector_num, nb_secto= rs, filename_over, buf1, quiet); if (ret) { --=20 2.13.6