[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v8 02/26] block: Use children list in bdrv_refresh_f
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v8 02/26] block: Use children list in bdrv_refresh_filename |
Date: |
Mon, 5 Feb 2018 16:18:11 +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 a8da4f2b25..b84aba2d95 100644
--- a/block.c
+++ b/block.c
@@ -5020,16 +5020,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 bb6c904704..1fa6c9c0e0 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 45e35c909f..5a627ba589 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.14.3
- [Qemu-block] [PATCH v8 00/26] block: Fix some filename generation issues, Max Reitz, 2018/02/05
- [Qemu-block] [PATCH v8 01/26] block/mirror: Small absolute-paths simplification, Max Reitz, 2018/02/05
- [Qemu-block] [PATCH v8 02/26] block: Use children list in bdrv_refresh_filename,
Max Reitz <=
- [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/05
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Kevin Wolf, 2018/02/22
- Re: [Qemu-block] [PATCH v8 03/26] block: Add BDS.backing_overridden, Max Reitz, 2018/02/22
[Qemu-block] [PATCH v8 04/26] iotests: Drop explicit base blockdev in 191, Max Reitz, 2018/02/05