[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 for-2.12 02/25] block: Use children list in bdrv_
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 for-2.12 02/25] block: Use children list in bdrv_refresh_filename |
Date: |
Mon, 20 Nov 2017 21:09:41 +0100 |
bdrv_refresh_filename() should invoke itself recursively on all
children, not just on file.
With that change, we can remove the manual invocations in blkverify,
quorum, commit, and mirror.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 9 +++++----
block/blkverify.c | 3 ---
block/commit.c | 1 -
block/mirror.c | 1 -
block/quorum.c | 1 -
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/block.c b/block.c
index 6c8ef98dfa..4aebf590d8 100644
--- a/block.c
+++ b/block.c
@@ -4965,16 +4965,17 @@ static bool append_open_options(QDict *d,
BlockDriverState *bs)
void bdrv_refresh_filename(BlockDriverState *bs)
{
BlockDriver *drv = bs->drv;
+ BdrvChild *child;
QDict *opts;
if (!drv) {
return;
}
- /* This BDS's file name will most probably depend on its file's name, so
- * refresh that first */
- if (bs->file) {
- bdrv_refresh_filename(bs->file->bs);
+ /* This BDS's file name may depend on any of its children's file names, so
+ * refresh those first */
+ QLIST_FOREACH(child, &bs->children, next) {
+ bdrv_refresh_filename(child->bs);
}
if (drv->bdrv_refresh_filename) {
diff --git a/block/blkverify.c b/block/blkverify.c
index 06369f9eac..b2ed8cd70d 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -281,9 +281,6 @@ static void blkverify_refresh_filename(BlockDriverState
*bs, QDict *options)
{
BDRVBlkverifyState *s = bs->opaque;
- /* bs->file->bs has already been refreshed */
- bdrv_refresh_filename(s->test_file->bs);
-
if (bs->file->bs->full_open_options
&& s->test_file->bs->full_open_options)
{
diff --git a/block/commit.c b/block/commit.c
index 5036eec434..cb529cc2aa 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -241,7 +241,6 @@ static int coroutine_fn
bdrv_commit_top_preadv(BlockDriverState *bs,
static void bdrv_commit_top_refresh_filename(BlockDriverState *bs, QDict *opts)
{
- bdrv_refresh_filename(bs->backing->bs);
pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
bs->backing->bs->filename);
}
diff --git a/block/mirror.c b/block/mirror.c
index f995924032..f059981f19 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1061,7 +1061,6 @@ static void
bdrv_mirror_top_refresh_filename(BlockDriverState *bs, QDict *opts)
* bdrv_set_backing_hd */
return;
}
- bdrv_refresh_filename(bs->backing->bs);
pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
bs->backing->bs->filename);
}
diff --git a/block/quorum.c b/block/quorum.c
index 272f9a5b77..2f1a628449 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1074,7 +1074,6 @@ static void quorum_refresh_filename(BlockDriverState *bs,
QDict *options)
int i;
for (i = 0; i < s->num_children; i++) {
- bdrv_refresh_filename(s->children[i]->bs);
if (!s->children[i]->bs->full_open_options) {
return;
}
--
2.13.6
- [Qemu-devel] [PATCH v7 for-2.12 00/25] block: Fix some filename generation issues, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 01/25] block/mirror: Small absolute-paths simplification, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 02/25] block: Use children list in bdrv_refresh_filename,
Max Reitz <=
- [Qemu-devel] [PATCH v7 for-2.12 03/25] block: Add BDS.backing_overridden, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 04/25] iotests: Drop explicit base blockdev in 191, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 05/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 06/25] block: Make path_combine() return the path, Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 07/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 08/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 09/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 10/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 11/25] block: Add bdrv_dirname(), Max Reitz, 2017/11/20
- [Qemu-devel] [PATCH v7 for-2.12 12/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2017/11/20