From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBtY9-0007YK-Gb for qemu-devel@nongnu.org; Tue, 29 Nov 2016 20:19:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBtY8-00063H-Lw for qemu-devel@nongnu.org; Tue, 29 Nov 2016 20:19:05 -0500 From: Max Reitz Date: Wed, 30 Nov 2016 02:18:28 +0100 Message-Id: <20161130011851.24696-3-mreitz@redhat.com> In-Reply-To: <20161130011851.24696-1-mreitz@redhat.com> References: <20161130011851.24696-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 02/25] block: Use children list in bdrv_refresh_filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf , Alberto Garcia , Eric Blake 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 Reviewed-by: Eric Blake Reviewed-by: Alberto Garcia --- 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