From: Maxim Levitsky <mlevitsk@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Maxim Levitsky <mlevitsk@redhat.com>,
Alberto Garcia <berto@igalia.com>,
qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>
Subject: [PATCH v5 4/4] block: qcow2: remove the created file on initialization error
Date: Wed, 9 Dec 2020 22:33:26 +0200 [thread overview]
Message-ID: <20201209203326.879381-5-mlevitsk@redhat.com> (raw)
In-Reply-To: <20201209203326.879381-1-mlevitsk@redhat.com>
If the qcow initialization fails, we should remove the file if it was
already created, to avoid leaving stale files around.
We already do this for luks raw images.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
block/qcow2.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 3a90ef2786..68c9182f92 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3847,12 +3847,14 @@ 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;
-finish:
+
qobject_unref(qdict);
bdrv_unref(bs);
bdrv_unref(data_bs);
--
2.26.2
next prev parent reply other threads:[~2020-12-09 20:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 20:33 [PATCH v5 0/4] qcow2: don't leave partially initialized file on image creation Maxim Levitsky
2020-12-09 20:33 ` [PATCH v5 1/4] crypto: luks: Fix tiny memory leak Maxim Levitsky
2020-12-10 10:28 ` Vladimir Sementsov-Ogievskiy
2020-12-09 20:33 ` [PATCH v5 2/4] block: add bdrv_co_delete_file_noerr Maxim Levitsky
2020-12-10 10:54 ` Vladimir Sementsov-Ogievskiy
2020-12-10 11:47 ` Maxim Levitsky
2020-12-09 20:33 ` [PATCH v5 3/4] crypto: luks: use bdrv_co_delete_file_noerr Maxim Levitsky
2020-12-10 10:55 ` Vladimir Sementsov-Ogievskiy
2020-12-09 20:33 ` Maxim Levitsky [this message]
2020-12-10 11:00 ` [PATCH v5 4/4] block: qcow2: remove the created file on initialization error Vladimir Sementsov-Ogievskiy
2020-12-10 11:02 ` Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201209203326.879381-5-mlevitsk@redhat.com \
--to=mlevitsk@redhat.com \
--cc=berto@igalia.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).