From nobody Wed Nov 12 07:09:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568801460; cv=none; d=zoho.com; s=zohoarc; b=IbIxpAQRSBpI1uBl28aTtMUUmAx/eJXNmPYstr8FpWLBGHL0Acd0ZGT3YJD3xy12arJ8ik3ZyL0xTNXRxdeJTm5IdGUEQMx6TvbTbhxtJgfwyWSg89vlTs/UslnaZmPP3Bb4Fkz8NARjUFoSxIJZxeHcWaBybSBsByuiC9WltbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568801460; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=92TLCjKlTclarl5pK8gCWHXYXoS7XnLfmh4T9r5IPFc=; b=YzKwu3RGFmVxsQLRdwGx11oaze884DyMNINJyDUFr9ZbQGcWpbfmKabvL272C04U8DzqmOfmzCTNjYcIYCWQY4BkPHciRCjU0DUvn1U0SZXwft5kq1bgRE8wH/zyONpGbwvY28IHLzUvIWHqbK/PUDCSH+jaDJn+vCHgwXf32vM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568801460877769.5288453888547; Wed, 18 Sep 2019 03:11:00 -0700 (PDT) Received: from localhost ([::1]:56924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAWvK-0002Az-SV for importer@patchew.org; Wed, 18 Sep 2019 06:10:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59444) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAWdU-0001YP-27 for qemu-devel@nongnu.org; Wed, 18 Sep 2019 05:52:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAWdS-00065Y-Qf for qemu-devel@nongnu.org; Wed, 18 Sep 2019 05:52:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58970) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAWdQ-00064O-Ea; Wed, 18 Sep 2019 05:52:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C3FA918C4266; Wed, 18 Sep 2019 09:52:27 +0000 (UTC) Received: from localhost (ovpn-116-168.ams2.redhat.com [10.36.116.168]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E01960603; Wed, 18 Sep 2019 09:52:21 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 18 Sep 2019 11:51:44 +0200 Message-Id: <20190918095144.955-9-mreitz@redhat.com> In-Reply-To: <20190918095144.955-1-mreitz@redhat.com> References: <20190918095144.955-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Wed, 18 Sep 2019 09:52:27 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 8/8] Revert "qemu-img: Check post-truncation size" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-devel@nongnu.org, Maxim Levitsky , Stefan Hajnoczi , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This reverts commit 5279b30392da7a3248b320c75f20c61e3a95863c. We no longer need this check because exact=3Dtrue forces the block driver to give the image the exact size requested by the user. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky --- qemu-img.c | 39 ++++----------------------------------- 1 file changed, 4 insertions(+), 35 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index a3169b6113..148f6b8b0e 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3648,7 +3648,7 @@ static int img_resize(int argc, char **argv) Error *err =3D NULL; int c, ret, relative; const char *filename, *fmt, *size; - int64_t n, total_size, current_size, new_size; + int64_t n, total_size, current_size; bool quiet =3D false; BlockBackend *blk =3D NULL; PreallocMode prealloc =3D PREALLOC_MODE_OFF; @@ -3829,42 +3829,11 @@ static int img_resize(int argc, char **argv) * success when the image has not actually been resized. */ ret =3D blk_truncate(blk, total_size, true, prealloc, &err); - if (ret < 0) { + if (!ret) { + qprintf(quiet, "Image resized.\n"); + } else { error_report_err(err); - goto out; - } - - new_size =3D blk_getlength(blk); - if (new_size < 0) { - error_report("Failed to verify truncated image length: %s", - strerror(-new_size)); - ret =3D -1; - goto out; } - - /* Some block drivers implement a truncation method, but only so - * the user can cause qemu to refresh the image's size from disk. - * The idea is that the user resizes the image outside of qemu and - * then invokes block_resize to inform qemu about it. - * (This includes iscsi and file-posix for device files.) - * Of course, that is not the behavior someone invoking - * qemu-img resize would find useful, so we catch that behavior - * here and tell the user. */ - if (new_size !=3D total_size && new_size =3D=3D current_size) { - error_report("Image was not resized; resizing may not be supported= " - "for this image"); - ret =3D -1; - goto out; - } - - if (new_size !=3D total_size) { - warn_report("Image should have been resized to %" PRIi64 - " bytes, but was resized to %" PRIi64 " bytes", - total_size, new_size); - } - - qprintf(quiet, "Image resized.\n"); - out: blk_unref(blk); if (ret) { --=20 2.21.0