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 v3 2/2] block: qcow2: remove the created file on initialization error
Date: Tue, 8 Dec 2020 16:21:59 +0200 [thread overview]
Message-ID: <20201208142159.492489-3-mlevitsk@redhat.com> (raw)
In-Reply-To: <20201208142159.492489-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>
---
block/qcow2.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/block/qcow2.c b/block/qcow2.c
index 3a90ef2786..3bc2096b72 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3848,6 +3848,19 @@ static int coroutine_fn qcow2_co_create_opts(BlockDriver *drv,
/* Create the qcow2 image (format layer) */
ret = qcow2_co_create(create_options, errp);
if (ret < 0) {
+
+ Error *local_delete_err = NULL;
+ int r_del = 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 != -ENOTSUP)) {
+ error_report_err(local_delete_err);
+ } else {
+ error_free(local_delete_err);
+ }
goto finish;
}
--
2.26.2
next prev parent reply other threads:[~2020-12-08 14:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 14:21 [PATCH v3 0/2] qcow2: don't leave partially initialized file on image creation Maxim Levitsky
2020-12-08 14:21 ` [PATCH v3 1/2] crypto: luks: Fix tiny memory leak Maxim Levitsky
2020-12-08 15:25 ` Alberto Garcia
2020-12-08 14:21 ` Maxim Levitsky [this message]
2020-12-08 15:26 ` [PATCH v3 2/2] block: qcow2: remove the created file on initialization error Alberto Garcia
2020-12-08 15:29 ` Maxim Levitsky
2020-12-08 15:47 ` Vladimir Sementsov-Ogievskiy
2020-12-08 16:27 ` Maxim Levitsky
2020-12-08 16:54 ` Vladimir Sementsov-Ogievskiy
2020-12-08 17:11 ` 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=20201208142159.492489-3-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.