From nobody Thu Dec 26 12:07:37 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1673551030; cv=none; d=zohomail.com; s=zohoarc; b=edxlVKRog4wZIbThY7DGCTfNngiNWKIQoBJk0zieWpXdewtGsAV5CL1wSXv7vL/kq1OA4zXDrv0Jzy/NsWDPxXWSPOBvhnd3BoiZ0cWIDDkr7z1AzZQz6rsaiEd+w/nwB93PVjmUXnnh2k2ndOSy8ZqLMzzyX1bFcVKYl05gIuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673551030; 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; bh=w4FMIKqOkK3PfzSvu0coa8Cvc9krYVpVU37RFcG4z+g=; b=FRUVm3AdJ/pnR872J6xv2thOd6ANoY0ekYYuCtBVUj6et+Q8hS8VpGQ6FnUyWvyX08+G2ekf1tDif2HOgnOkkGjOZ0XviXjwukQBfMkmq65M6Kc7TNypTyKb937awMEEZpNRzqlRnEnC8gGOGAa2wgX+pJ+yWl6TEJZCNCMEuAg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTP id 1673551030807780.589388128302; Thu, 12 Jan 2023 11:17:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32c-0007aT-Pf; Thu, 12 Jan 2023 14:15:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32a-0007Z3-5t for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32Y-0008E2-FG for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:07 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-375-zB5t0XBBPeie9XP0WKEKQw-1; Thu, 12 Jan 2023 14:15:04 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F05CB802D36; Thu, 12 Jan 2023 19:15:03 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id B19F0492C14; Thu, 12 Jan 2023 19:15:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w4FMIKqOkK3PfzSvu0coa8Cvc9krYVpVU37RFcG4z+g=; b=H/117CVcaRaylDDQulVfboVEkslUkY98IZehN51jqtrTLOxcb0zF+1nKw/5zWYBf3qOyZC 1cV5VdyjyYm9kQrEDCuFwZ00jjiKErLZQgxXmwbHyIt6FvkrVmL0E6S77KgKWG+bRAFBr0 Jn4syCz8D47j2GhxV1RtmezOWAu3w7g= X-MC-Unique: zB5t0XBBPeie9XP0WKEKQw-1 From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, hreitz@redhat.com, aesteve@redhat.com, nsoffer@redhat.com, qemu-devel@nongnu.org Subject: [PATCH 3/4] qemu-img bitmap: Report errors while closing the image Date: Thu, 12 Jan 2023 20:14:53 +0100 Message-Id: <20230112191454.169353-4-kwolf@redhat.com> In-Reply-To: <20230112191454.169353-1-kwolf@redhat.com> References: <20230112191454.169353-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673551031810100001 Content-Type: text/plain; charset="utf-8" blk_unref() can't report any errors that happen while closing the image. For example, if qcow2 hits an -ENOSPC error while writing out dirty bitmaps when it's closed, it prints error messages to stderr, but 'qemu-img bitmap' won't see any error return value and will therefore look successful with exit code 0. In order to fix this, manually inactivate the image first before calling blk_unref(). This already performs the operations that would be most likely to fail while closing the image, but it can still return errors. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1330 Signed-off-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- qemu-img.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 22d6ecefd5..c3671d4890 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -4645,6 +4645,7 @@ static int img_bitmap(int argc, char **argv) QSIMPLEQ_HEAD(, ImgBitmapAction) actions; ImgBitmapAction *act, *act_next; const char *op; + int inactivate_ret; =20 QSIMPLEQ_INIT(&actions); =20 @@ -4829,6 +4830,16 @@ static int img_bitmap(int argc, char **argv) ret =3D 0; =20 out: + /* + * Manually inactivate the images first because this way we can know w= hether + * an error occurred. blk_unref() doesn't tell us about failures. + */ + inactivate_ret =3D bdrv_inactivate_all(); + if (inactivate_ret < 0) { + error_report("Error while closing the image: %s", strerror(-inacti= vate_ret)); + ret =3D 1; + } + blk_unref(src); blk_unref(blk); qemu_opts_del(opts); --=20 2.38.1