From nobody Mon Feb 9 09:22:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607541050; cv=none; d=zohomail.com; s=zohoarc; b=RVdPYNw7uO8zHGF+ue2UZi+jmeHBk37WwzYwqqkqEedpumLZA7yNJd1gcySLAtsb7Tb/P0flc6uR2iriayz7rA70wkyp7afzEj4RBJr81xe8Y/wvmHkn5nQrFfyDXDy6W4s3XGQwMuur4sPMLksEG4876zRTGz5I0uIWfnTL58o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607541050; h=Content-Type: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=1MGdOSRuaY0jL7WFzslodoODfTjJHh5fpzO4HwJ4MUw=; b=a0j3pedsJwL8pFmAnQ9WyA0EBPfUQdQPgJqg27yua1KVyBVE3GgYtTtJTGqVjuvOfHFDenxlENCaI7bBmvAP30f1orPJO/NuUHZZ+dwhgzyOloz+6/+OwmfrnSSrzPpYonbop/o2N1X2ha9YEe1wCf1w5bx3n0ad1pBaKx2E0PQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607541050602470.0889803179517; Wed, 9 Dec 2020 11:10:50 -0800 (PST) Received: from localhost ([::1]:58256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn2gN-00079T-IC for importer@patchew.org; Wed, 09 Dec 2020 11:51:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn2aM-0002qq-Ej for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:02 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34730) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kn2aG-0003K1-An for qemu-devel@nongnu.org; Wed, 09 Dec 2020 11:45:02 -0500 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-426-5lylo0e5NHC-_B0wGT1jOg-1; Wed, 09 Dec 2020 11:44:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78FAA1842141; Wed, 9 Dec 2020 16:44:50 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.133]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A9FF1E5; Wed, 9 Dec 2020 16:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607532295; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1MGdOSRuaY0jL7WFzslodoODfTjJHh5fpzO4HwJ4MUw=; b=YxN7oso8EOGGinmxmcRSCdTkKzKxCJTYCmgEFCgKoGnAy8v5DJwXX94XZbEHjbf+ruMoBA qgKYKCm6VrAtaoPupGW3tJZan2oBJj38WBRzhu2cLlW0Nb+w4j6rUyYxMkd4jbxLA871FV 9Nl2E01YZtyqsX5JSYHnm4tvKHiIZaw= X-MC-Unique: 5lylo0e5NHC-_B0wGT1jOg-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH v4 2/4] block: add bdrv_co_delete_file_noerr Date: Wed, 9 Dec 2020 18:44:39 +0200 Message-Id: <20201209164441.867945-3-mlevitsk@redhat.com> In-Reply-To: <20201209164441.867945-1-mlevitsk@redhat.com> References: <20201209164441.867945-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mlevitsk@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mlevitsk@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, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: Kevin Wolf , Maxim Levitsky , Alberto Garcia , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This function wraps bdrv_co_delete_file for the common case of removing a f= ile, which was just created by format driver, on an error condition. It hides the -ENOTSUPP error, and reports all other errors otherwise. Signed-off-by: Maxim Levitsky Reviewed-by: Alberto Garcia --- block.c | 23 +++++++++++++++++++++++ include/block/block.h | 1 + 2 files changed, 24 insertions(+) diff --git a/block.c b/block.c index f1cedac362..57e6d9750a 100644 --- a/block.c +++ b/block.c @@ -704,6 +704,29 @@ int coroutine_fn bdrv_co_delete_file(BlockDriverState = *bs, Error **errp) return ret; } =20 +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs) +{ + Error *local_err =3D NULL; + + if (!bs) { + return; + } + + int ret =3D bdrv_co_delete_file(bs, &local_err); + /* + * ENOTSUP will happen if the block driver doesn't support + * the 'bdrv_co_delete_file' interface. This is a predictable + * scenario and shouldn't be reported back to the user. + */ + if (ret =3D=3D -ENOTSUP) { + error_free(local_err); + } else if (ret < 0) { + error_report_err(local_err); + } +} + + + /** * Try to get @bs's logical and physical block size. * On success, store them in @bsz struct and return 0. diff --git a/include/block/block.h b/include/block/block.h index c9d7c58765..af03022723 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -428,6 +428,7 @@ int bdrv_freeze_backing_chain(BlockDriverState *bs, Blo= ckDriverState *base, Error **errp); void bdrv_unfreeze_backing_chain(BlockDriverState *bs, BlockDriverState *b= ase); int coroutine_fn bdrv_co_delete_file(BlockDriverState *bs, Error **errp); +void coroutine_fn bdrv_co_delete_file_noerr(BlockDriverState *bs); =20 =20 typedef struct BdrvCheckResult { --=20 2.26.2