From nobody Fri May 9 08:35:16 2025 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=1673550987; cv=none; d=zohomail.com; s=zohoarc; b=SX+F4kHza0mpXHotJ/BVThVsEXyuVvWyIArm2iNu/GJpdyda5se/WRSGAlpXJRo9ERWcQNsSYywLqtJKov7MOSSSNLY62T1DswKgXXw2sz7bSLphHx+ca4ZbSOAaVNqHluyUwC44tmt2VIh8r7GCLJ3IjOwYXRZW+0Ea2a9TH3w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673550987; 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=8LiTmw3QdTShVcaKcTC5WIhseguMBvfQFAYKy9Z4p+w=; b=L808xsQOXrFWRbKk6co+VrQCDeM8sCQ8algLgR5uBnepbvls4gTMNm78J0khIv8hO1gEx61He8IoMD1SX0Aa19kcA8ixl6T8E8RYeU5PufTJe2P7PWd++FVmSQP8dDjq2P4FxZvaK4U4bPo04o8oWHFVEI9Jn1kjBs1ntiRoL2Q= 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 SMTPS id 1673550987171684.2350126047443; Thu, 12 Jan 2023 11:16:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pG32c-0007ao-Tb; 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-0007ZD-9k for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pG32Y-0008EA-Ne for qemu-devel@nongnu.org; Thu, 12 Jan 2023 14:15:08 -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-382-PXne6unhPKONttOoXjPs7w-1; Thu, 12 Jan 2023 14:15:02 -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 68998802D36; Thu, 12 Jan 2023 19:15:02 +0000 (UTC) Received: from merkur.redhat.com (unknown [10.39.195.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26A3F492C18; Thu, 12 Jan 2023 19:15:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673550906; 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=8LiTmw3QdTShVcaKcTC5WIhseguMBvfQFAYKy9Z4p+w=; b=LFmTtKeF2JvT9lQ55CaT8vdZK5cLwUX8aKwHT8rDbcdi/hbBMlrOo5RaDL+7wTHypS8Miy WCFIvLvjZe+dzrOzlgCk1e8HesfV9MmLgEgF4mnLSWW5TJohmCdzn4TeQVFKnwN/6YcqfI tg7tcRuicSfVI+wdgfxziORtnC0wSSk= X-MC-Unique: PXne6unhPKONttOoXjPs7w-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 2/4] qemu-img commit: Report errors while closing the image Date: Thu, 12 Jan 2023 20:14:52 +0100 Message-Id: <20230112191454.169353-3-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.133.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=unavailable 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: 1673550987677100001 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 commit' 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. Signed-off-by: Kevin Wolf --- qemu-img.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/qemu-img.c b/qemu-img.c index 439d8de1e3..22d6ecefd5 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -449,6 +449,11 @@ static BlockBackend *img_open(bool image_opts, blk =3D img_open_file(filename, NULL, fmt, flags, writethrough, qu= iet, force_share); } + + if (blk) { + blk_set_force_allow_inactivate(blk); + } + return blk; } =20 @@ -1119,6 +1124,14 @@ unref_backing: done: qemu_progress_end(); =20 + /* + * Manually inactivate the image first because this way we can know wh= ether + * an error occurred. blk_unref() doesn't tell us about failures. + */ + ret =3D bdrv_inactivate_all(); + if (ret < 0 && !local_err) { + error_setg_errno(&local_err, -ret, "Error while closing the image"= ); + } blk_unref(blk); =20 if (local_err) { --=20 2.38.1