qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>, Alberto Garcia <berto@igalia.com>,
	Eric Blake <eblake@redhat.com>
Subject: [Qemu-devel] [PATCH v3 02/25] block: Use children list in bdrv_refresh_filename
Date: Wed, 30 Nov 2016 02:18:28 +0100	[thread overview]
Message-ID: <20161130011851.24696-3-mreitz@redhat.com> (raw)
In-Reply-To: <20161130011851.24696-1-mreitz@redhat.com>

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 <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
 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

  parent reply	other threads:[~2016-11-30  1:19 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-30  1:18 [Qemu-devel] [PATCH v3 00/25] block: Fix some filename generation issues Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 01/25] block/mirror: Small absolute-paths simplification Max Reitz
2016-12-15 16:14   ` Alberto Garcia
2016-11-30  1:18 ` Max Reitz [this message]
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 03/25] block: Add BDS.backing_overridden Max Reitz
2017-01-11 19:00   ` Eric Blake
2017-01-11 19:06     ` Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 04/25] block: Respect backing bs in bdrv_refresh_filename Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 05/25] block: Make path_combine() return the path Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val Max Reitz
2016-12-15 16:28   ` Alberto Garcia
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 07/25] block: bdrv_get_full_backing_filename's " Max Reitz
2016-12-15 16:39   ` Alberto Garcia
2016-12-16 13:26     ` Max Reitz
2016-12-16 13:51       ` Alberto Garcia
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 08/25] block: Add bdrv_make_absolute_filename() Max Reitz
2016-12-16 10:23   ` Alberto Garcia
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 09/25] block: Fix bdrv_find_backing_image() Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 10/25] block: Add bdrv_dirname() Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 12/25] quorum: " Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 13/25] block/nbd: Implement bdrv_dirname() Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 14/25] block/nfs: " Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 15/25] block: Use bdrv_dirname() for relative filenames Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 16/25] block: Add 'base-directory' BDS option Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 17/25] iotests: Add quorum case to test 110 Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 18/25] block: Add sgfnt_runtime_opts to BlockDriver Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_options Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 20/25] block: Generically refresh runtime options Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 21/25] block: Purify .bdrv_refresh_filename() Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 22/25] block: Do not copy exact_filename from format file Max Reitz
2017-01-11 16:29   ` Max Reitz
2017-01-11 17:13     ` Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 23/25] block: Fix FIXME from "Add BDS.backing_overridden" Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 24/25] block/curl: Implement bdrv_refresh_filename() Max Reitz
2016-11-30  1:18 ` [Qemu-devel] [PATCH v3 25/25] block/null: Generate filename even with latency-ns Max Reitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161130011851.24696-3-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=berto@igalia.com \
    --cc=eblake@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).