From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 55A66C433E0 for ; Fri, 10 Jul 2020 12:42:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 20CB520772 for ; Fri, 10 Jul 2020 12:42:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HoOlPZQu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20CB520772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jtsMM-0008Qb-Eg for qemu-devel@archiver.kernel.org; Fri, 10 Jul 2020 08:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jtsLZ-0007rt-75 for qemu-devel@nongnu.org; Fri, 10 Jul 2020 08:41:46 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:23574) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jtsLV-0006HS-FS for qemu-devel@nongnu.org; Fri, 10 Jul 2020 08:41:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594384897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IsLOF7FVyTEjLMEOBCGZ0cmsLI8dMUM4H6hiAdTOcYw=; b=HoOlPZQu3wemzP435k2A96kYZdwxXnYukCTCabKTURbWklnWhUMRjV9e1uH7tZ+XOD38LN XpvypFpSf/0iiK8iVRN9OT4WtVyyPL2Y0JCKCTTadWHOSqS4EihSLfxjSmGVV7vvCWkVgJ bFm0QzV3XosqyBbXZtZoXyRSWNiO3iQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-Bh_8JhTKOKO-MRNJSMAcZw-1; Fri, 10 Jul 2020 08:41:36 -0400 X-MC-Unique: Bh_8JhTKOKO-MRNJSMAcZw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CE85107ACCA; Fri, 10 Jul 2020 12:41:35 +0000 (UTC) Received: from linux.fritz.box (ovpn-114-57.ams2.redhat.com [10.36.114.57]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3324D6111F; Fri, 10 Jul 2020 12:41:34 +0000 (UTC) Date: Fri, 10 Jul 2020 14:41:32 +0200 From: Kevin Wolf To: Peter Maydell Subject: Re: [PATCH for-5.1] qemu-img resize: Require --shrink for shrinking all image formats Message-ID: <20200710124132.GF6641@linux.fritz.box> References: <20200710121717.28339-1-kwolf@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=kwolf@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/09 22:08:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: QEMU Developers , Qemu-block , Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Am 10.07.2020 um 14:33 hat Peter Maydell geschrieben: > On Fri, 10 Jul 2020 at 13:17, Kevin Wolf wrote: > > > > QEMU 2.11 introduced the --shrink option for qemu-img resize to avoid > > accidentally shrinking images (commit 4ffca8904a3). However, for > > compatibility reasons, it was not enforced for raw images yet, but only > > a deprecation warning was printed. This warning has existed for long > > enough that we can now finally require --shrink for raw images, too, and > > error out if it's not given. > > > > Documentation already describes the state as it is after this patch. > > > > Signed-off-by: Kevin Wolf > > --- > > qemu-img.c | 17 +++-------------- > > 1 file changed, 3 insertions(+), 14 deletions(-) > > > > diff --git a/qemu-img.c b/qemu-img.c > > index e3b2ec3e78..f6a2703039 100644 > > --- a/qemu-img.c > > +++ b/qemu-img.c > > @@ -4011,20 +4011,9 @@ static int img_resize(int argc, char **argv) > > } > > > > if (total_size < current_size && !shrink) { > > - warn_report("Shrinking an image will delete all data beyond the " > > - "shrunken image's end. Before performing such an " > > - "operation, make sure there is no important data there."); > > - > > - if (g_strcmp0(bdrv_get_format_name(blk_bs(blk)), "raw") != 0) { > > - error_report( > > - "Use the --shrink option to perform a shrink operation."); > > - ret = -1; > > - goto out; > > - } else { > > - warn_report("Using the --shrink option will suppress this message. " > > - "Note that future versions of qemu-img may refuse to " > > - "shrink images without this option."); > > - } > > + error_report("Use the --shrink option to perform a shrink operation."); > > I think it would be nice to retain this bit of text: > > > - warn_report("Shrinking an image will delete all data beyond the " > > - "shrunken image's end. Before performing such an " > > - "operation, make sure there is no important data there."); > > ie, make the raw-shrink case be the same as the non-raw-shrink > case currently does. I had this at first, but then the whole thing looked like a warning and I wasn't sure that it would still be understood as an error. (Which is of course a preexisting problem for non-raw.) Maybe it becomes clearer if I just swap the order and print the error first and only then the warning? Kevin