[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] block: qcow2: remove the created file on initialization err
From: |
Kevin Wolf |
Subject: |
[PULL 09/11] block: qcow2: remove the created file on initialization error |
Date: |
Mon, 15 Feb 2021 16:00:58 +0100 |
From: Maxim Levitsky <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>
Message-Id: <20201217170904.946013-4-mlevitsk@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/qcow2.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 5d94f45be9..d9f49a52e7 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -3846,12 +3846,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);
+ } else {
+ ret = 0;
}
- ret = 0;
-finish:
qobject_unref(qdict);
bdrv_unref(bs);
bdrv_unref(data_bs);
--
2.29.2
- [PULL 00/11] Block layer patches, Kevin Wolf, 2021/02/15
- [PULL 04/11] hw/ide/ahci: map cmd_fis as DMA_DIRECTION_TO_DEVICE, Kevin Wolf, 2021/02/15
- [PULL 01/11] qemu-storage-daemon: Enable object-add, Kevin Wolf, 2021/02/15
- [PULL 05/11] xen-block: fix reporting of discard feature, Kevin Wolf, 2021/02/15
- [PULL 09/11] block: qcow2: remove the created file on initialization error,
Kevin Wolf <=
- [PULL 06/11] tests/qemu-iotests: Remove test 259 from the "auto" group, Kevin Wolf, 2021/02/15
- [PULL 03/11] blockjob: Fix crash with IOthread when block commit after snapshot, Kevin Wolf, 2021/02/15
- [PULL 10/11] monitor: Fix assertion failure on shutdown, Kevin Wolf, 2021/02/15
- [PULL 07/11] crypto: luks: Fix tiny memory leak, Kevin Wolf, 2021/02/15
- [PULL 08/11] block: add bdrv_co_delete_file_noerr, Kevin Wolf, 2021/02/15
- [PULL 11/11] monitor/qmp: Stop processing requests when shutdown is requested, Kevin Wolf, 2021/02/15
- [PULL 02/11] iotests: Consistent $IMGOPTS boundary matching, Kevin Wolf, 2021/02/15
- Re: [PULL 00/11] Block layer patches, Peter Maydell, 2021/02/15