[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/17] block/qcow2-bitmap: return status from qcow2_store_persiste
From: |
Eric Blake |
Subject: |
[PULL 13/17] block/qcow2-bitmap: return status from qcow2_store_persistent_dirty_bitmaps |
Date: |
Tue, 9 Mar 2021 09:51:58 -0600 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
It's better to return status together with setting errp. It makes
possible to avoid error propagation.
While being here, put ERRP_GUARD() to fix error_prepend(errp, ...)
usage inside qcow2_store_persistent_dirty_bitmaps() (see the comment
above ERRP_GUARD() definition in include/qapi/error.h)
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-11-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/qcow2.h | 2 +-
block/qcow2-bitmap.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/block/qcow2.h b/block/qcow2.h
index d19c8832062e..0fe5f74ed3ea 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -984,7 +984,7 @@ bool qcow2_get_bitmap_info_list(BlockDriverState *bs,
Qcow2BitmapInfoList **info_list, Error **errp);
int qcow2_reopen_bitmaps_rw(BlockDriverState *bs, Error **errp);
int qcow2_truncate_bitmaps_check(BlockDriverState *bs, Error **errp);
-void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
+bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
bool release_stored, Error **errp);
int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp);
bool qcow2_co_can_store_new_dirty_bitmap(BlockDriverState *bs,
diff --git a/block/qcow2-bitmap.c b/block/qcow2-bitmap.c
index 9452e9fe76c3..f417f9ccb195 100644
--- a/block/qcow2-bitmap.c
+++ b/block/qcow2-bitmap.c
@@ -1531,9 +1531,10 @@ out:
* readonly to begin with, and whether we opened directly or reopened to that
* state shouldn't matter for the state we get afterward.
*/
-void qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
+bool qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
bool release_stored, Error **errp)
{
+ ERRP_GUARD();
BdrvDirtyBitmap *bitmap;
BDRVQcow2State *s = bs->opaque;
uint32_t new_nb_bitmaps = s->nb_bitmaps;
@@ -1553,7 +1554,7 @@ void
qcow2_store_persistent_dirty_bitmaps(BlockDriverState *bs,
bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,
s->bitmap_directory_size, errp);
if (bm_list == NULL) {
- return;
+ return false;
}
}
@@ -1668,7 +1669,7 @@ success:
}
bitmap_list_free(bm_list);
- return;
+ return true;
fail:
QSIMPLEQ_FOREACH(bm, bm_list, entry) {
@@ -1686,16 +1687,14 @@ fail:
}
bitmap_list_free(bm_list);
+ return false;
}
int qcow2_reopen_bitmaps_ro(BlockDriverState *bs, Error **errp)
{
BdrvDirtyBitmap *bitmap;
- Error *local_err = NULL;
- qcow2_store_persistent_dirty_bitmaps(bs, false, &local_err);
- if (local_err != NULL) {
- error_propagate(errp, local_err);
+ if (!qcow2_store_persistent_dirty_bitmaps(bs, false, errp)) {
return -EINVAL;
}
--
2.30.1
- [PULL 00/17] NBD patches through 2021-03-09, Eric Blake, 2021/03/09
- [PULL 02/17] nbd: server: Report holes for raw images, Eric Blake, 2021/03/09
- [PULL 03/17] utils: Enhance testsuite for do_strtosz(), Eric Blake, 2021/03/09
- [PULL 04/17] utils: Improve qemu_strtosz() to have 64 bits of precision, Eric Blake, 2021/03/09
- [PULL 01/17] MAINTAINERS: add Vladimir as co-maintainer of NBD, Eric Blake, 2021/03/09
- [PULL 07/17] blockdev: fix drive_backup_prepare() missed error, Eric Blake, 2021/03/09
- [PULL 06/17] block: check return value of bdrv_open_child and drop error propagation, Eric Blake, 2021/03/09
- [PULL 05/17] utils: Deprecate hex-with-suffix sizes, Eric Blake, 2021/03/09
- [PULL 12/17] block/qcow2-bitmap: improve qcow2_load_dirty_bitmaps() interface, Eric Blake, 2021/03/09
- [PULL 11/17] block/qcow2: qcow2_get_specific_info(): drop error propagation, Eric Blake, 2021/03/09
- [PULL 13/17] block/qcow2-bitmap: return status from qcow2_store_persistent_dirty_bitmaps,
Eric Blake <=
- [PULL 10/17] blockjob: return status from block_job_set_speed(), Eric Blake, 2021/03/09
- [PULL 16/17] block/qed: bdrv_qed_do_open: deal with errp, Eric Blake, 2021/03/09
- [PULL 17/17] block/qcow2: refactor qcow2_update_options_prepare error paths, Eric Blake, 2021/03/09
- [PULL 08/17] block: drop extra error propagation for bdrv_set_backing_hd, Eric Blake, 2021/03/09
- [PULL 14/17] block/qcow2: read_cache_sizes: return status value, Eric Blake, 2021/03/09
- [PULL 09/17] block/mirror: drop extra error propagation in commit_active_start(), Eric Blake, 2021/03/09
- [PULL 15/17] block/qcow2: simplify qcow2_co_invalidate_cache(), Eric Blake, 2021/03/09
- Re: [PULL 00/17] NBD patches through 2021-03-09, Peter Maydell, 2021/03/11
- Re: [PULL 00/17] NBD patches through 2021-03-09, Peter Maydell, 2021/03/11