From nobody Sun May 19 08:26:16 2024 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=1594899302; cv=none; d=zohomail.com; s=zohoarc; b=k298BdJsHrppyjnAn3W8hvn46KUZasS9TOefQ9fuX/Dszf9WEXy8Y5vNFEIJjMtZ4VCzBhDBMtDZFD1IqLZy98QPriTbfrlUZTYGsoNFwbEKhrmxsUPB0ykkEj1+XO2l0K7733WbE7fB3cP9Xpj2+4uDKdvwJFcqmD5esZp0HIo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594899302; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=sfRkK2LONU+ru0FioGGHw1EjM7CZJihTKil1uNkwr+w=; b=AAmVyB4LAYLv7JfBjZ3jm2kd2mz2aGzB1Sg94B0DWqfgRzzkQeajZsbhLsLGaaVRGnvwnkRoonwChWlemPYSt1XUj+9kajY0aavRxXfTXqgFkme5JvEMn+AwAxYKjeLvfsGYGOU/Lwoltr6a/5LFf9yXnvpJ3m97N8pL87UjAZE= 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 159489930223275.58620224676974; Thu, 16 Jul 2020 04:35:02 -0700 (PDT) Received: from localhost ([::1]:59258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jw2AF-000502-RI for importer@patchew.org; Thu, 16 Jul 2020 07:34:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jw29S-0004UL-Ea for qemu-devel@nongnu.org; Thu, 16 Jul 2020 07:34:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:55802 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jw29Q-0007n8-Hp for qemu-devel@nongnu.org; Thu, 16 Jul 2020 07:34:09 -0400 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-55-HNu4qpy0P4G6qOqT3zimKQ-1; Thu, 16 Jul 2020 07:34:03 -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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF21C100AA22; Thu, 16 Jul 2020 11:34:02 +0000 (UTC) Received: from starship.redhat.com (unknown [10.35.206.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2842B79D10; Thu, 16 Jul 2020 11:34:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594899247; 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; bh=sfRkK2LONU+ru0FioGGHw1EjM7CZJihTKil1uNkwr+w=; b=evI1aydlTDDIZGvHJq+niw7aWF5tm1iHX/JpSvbc6TBUJA2IDWcFbfdEGli19XD3s3Gtjm P0Z7b6OJ2YyUz4HLdjH4s9x4XHkfBavkNT/RN6vKDvXF/x+HB39IqqZ5alCdnoSFhFXnpk Eq35Fa7CL80DAGWIahwToJSC3ajPP/A= X-MC-Unique: HNu4qpy0P4G6qOqT3zimKQ-1 From: Maxim Levitsky To: qemu-devel@nongnu.org Subject: [PATCH] qcow2: cleanup created file when qcow2_co_create Date: Thu, 16 Jul 2020 14:33:59 +0300 Message-Id: <20200716113359.15656-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=207.211.31.120; envelope-from=mlevitsk@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/16 04:25:38 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: Kevin Wolf , Maxim Levitsky , 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 is basically the same thing as commit 'crypto.c: cleanup created file when block_crypto_co_create_opts_luks fails' does but for qcow2 files to ensure that we don't leave qcow2 files when creation fails. Signed-off-by: Maxim Levitsky --- block/qcow2.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index fadf3422f8..8b848924b5 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3794,6 +3794,17 @@ static int coroutine_fn qcow2_co_create_opts(BlockDr= iver *drv, /* Create the qcow2 image (format layer) */ ret =3D qcow2_co_create(create_options, errp); if (ret < 0) { + + Error *local_delete_err =3D NULL; + int r_del =3D bdrv_co_delete_file(bs, &local_delete_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 ((r_del < 0) && (r_del !=3D -ENOTSUP)) { + error_report_err(local_delete_err); + } goto finish; } =20 --=20 2.26.2