[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_f
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_filename |
Date: |
Sun, 27 Nov 2016 02:56:00 +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 and
quorum.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 9 +++++----
block/blkverify.c | 3 ---
block/quorum.c | 1 -
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/block.c b/block.c
index 39ddea3..1615f5d 100644
--- a/block.c
+++ b/block.c
@@ -3948,16 +3948,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 28f9af6..e0f9275 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -293,9 +293,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/quorum.c b/block/quorum.c
index d122299..45e61bb 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1058,7 +1058,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.10.2
- [Qemu-block] [PATCH v2 00/24] block: Fix some filename generation issues, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 01/24] block/mirror: Small absolute-paths simplification, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_filename,
Max Reitz <=
- [Qemu-block] [PATCH v2 03/24] block: Add BDS.backing_overridden, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 05/24] block: Make path_combine() return the path, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 04/24] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 06/24] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 07/24] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 09/24] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 10/24] block: Add bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26