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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 5D217C4361B for ; Wed, 9 Dec 2020 17:56:28 +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 B611B23C8E for ; Wed, 9 Dec 2020 17:56:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B611B23C8E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=igalia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kn3hS-0007AF-GF for qemu-devel@archiver.kernel.org; Wed, 09 Dec 2020 12:56:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kn3TJ-00022O-Cs; Wed, 09 Dec 2020 12:41:49 -0500 Received: from fanzine.igalia.com ([178.60.130.6]:33562) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kn3TH-0007J2-Nz; Wed, 09 Dec 2020 12:41:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=N3uBH36JDrW10IvFdxGhtJ2MS0aGjVmU6MbMGICAjLg=; b=em7fYeIY6RJb61wEa1pmiIgS6Qy4q/q5Ek28jqfhKHBIxix9BwodV277UG6q2ShuWGw8XFwZyUOANcWnmWYptgIlWwi2oU092xb5VAjdJ1P0WI9GD68E4NqjiZhjYJ1u7ywQrnqOVbIwgsXxGEx5Xb2oZLH6cHiTpacQczFFq+wD9MaatxHGrEaE5NZTxgKASLpqP/qetTRLi1ngscbpYD1f/wUms8o/yZRHnUgQS4DW5VsUBku4o+KtLO0S+ZeaKnVVHMpBwnnUz5j7a/twURy1REo8LM5nQD+tYtCHZPbi7RVYC+YCaKSFeE3fCD+GDSkzubKOYos7+l3d6zmlyA==; Received: from maestria.local.igalia.com ([192.168.10.14] helo=mail.igalia.com) by fanzine.igalia.com with esmtps (Cipher TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim) id 1kn3TE-0005xd-FP; Wed, 09 Dec 2020 18:41:44 +0100 Received: from berto by mail.igalia.com with local (Exim) id 1kn3TE-0003Co-61; Wed, 09 Dec 2020 18:41:44 +0100 From: Alberto Garcia To: Maxim Levitsky , qemu-devel@nongnu.org Subject: Re: [PATCH v4 4/4] block: qcow2: remove the created file on initialization error In-Reply-To: <20201209164441.867945-5-mlevitsk@redhat.com> References: <20201209164441.867945-1-mlevitsk@redhat.com> <20201209164441.867945-5-mlevitsk@redhat.com> User-Agent: Notmuch/0.18.2 (http://notmuchmail.org) Emacs/24.4.1 (i586-pc-linux-gnu) Date: Wed, 09 Dec 2020 18:41:44 +0100 Message-ID: MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=178.60.130.6; envelope-from=berto@igalia.com; helo=fanzine.igalia.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, 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.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed 09 Dec 2020 05:44:41 PM CET, Maxim Levitsky wrote: > @@ -3847,12 +3847,13 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv, > > /* Create the qcow2 image (format layer) */ > ret = qcow2_co_create(create_options, errp); > + > +finish: > if (ret < 0) { > - goto finish; > + bdrv_co_delete_file_noerr(bs); > + bdrv_co_delete_file_noerr(data_bs); > } > > - ret = 0; Many/most functions in qcow2.c force ret to be 0 on success, we could also keep that here (although in practice I don't think that ret can be greater than 0 in this case, or that the caller would care). Either way, Reviewed-by: Alberto Garcia Berto