mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: Use children list in bdrv_refresh_filename

Browse Source 
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, mirror, and blklogwrites.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-id: 20190201192935.18394-3-mreitz@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2019-02-01 20:29:06 +01:00
parent f30c66ba6e
commit e24518e303
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block.c
View File

@ -5536,16 +5536,17 @@ static bool append_open_options(QDict *d, BlockDriverState *bs)
void bdrv_refresh_filename(BlockDriverState *bs) void bdrv_refresh_filename(BlockDriverState *bs)
{ {
BlockDriver *drv = bs->drv; BlockDriver *drv = bs->drv;
BdrvChild *child;
QDict *opts; QDict *opts;
if (!drv) { if (!drv) {
return; return;
} }
/* This BDS's file name will most probably depend on its file's name, so /* This BDS's file name may depend on any of its children's file names, so
* refresh that first */ * refresh those first */
if (bs->file) { QLIST_FOREACH(child, &bs->children, next) {
bdrv_refresh_filename(bs->file->bs); bdrv_refresh_filename(child->bs);
} }
if (drv->bdrv_refresh_filename) { if (drv->bdrv_refresh_filename) {

3
block/blklogwrites.c
View File

@ -285,9 +285,6 @@ static void blk_log_writes_refresh_filename(BlockDriverState *bs,
{ {
BDRVBlkLogWritesState *s = bs->opaque; BDRVBlkLogWritesState *s = bs->opaque;
/* bs->file->bs has already been refreshed */
bdrv_refresh_filename(s->log_file->bs);
if (bs->file->bs->full_open_options if (bs->file->bs->full_open_options
&& s->log_file->bs->full_open_options) && s->log_file->bs->full_open_options)
{ {

3
block/blkverify.c
View File

@ -285,9 +285,6 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)
{ {
BDRVBlkverifyState *s = bs->opaque; 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 if (bs->file->bs->full_open_options
&& s->test_file->bs->full_open_options) && s->test_file->bs->full_open_options)
{ {

1
block/commit.c
View File

@ -232,7 +232,6 @@ static int coroutine_fn bdrv_commit_top_preadv(BlockDriverState *bs,
static void bdrv_commit_top_refresh_filename(BlockDriverState *bs, QDict *opts) 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), pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
bs->backing->bs->filename); bs->backing->bs->filename);
} }

1
block/mirror.c
View File

@ -1438,7 +1438,6 @@ static void bdrv_mirror_top_refresh_filename(BlockDriverState *bs, QDict *opts)
* bdrv_set_backing_hd */ * bdrv_set_backing_hd */
return; return;
} }
bdrv_refresh_filename(bs->backing->bs);
pstrcpy(bs->exact_filename, sizeof(bs->exact_filename), pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
bs->backing->bs->filename); bs->backing->bs->filename);
} }

1
block/quorum.c
View File

@ -1073,7 +1073,6 @@ static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)
int i; int i;
for (i = 0; i < s->num_children; i++) { for (i = 0; i < s->num_children; i++) {
bdrv_refresh_filename(s->children[i]->bs);
if (!s->children[i]->bs->full_open_options) { if (!s->children[i]->bs->full_open_options) {
return; return;
} }