[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH for-3.1 v10 03/31] block: Skip implicit nodes for fi
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH for-3.1 v10 03/31] block: Skip implicit nodes for filename info |
Date: |
Thu, 9 Aug 2018 23:35:00 +0200 |
bdrv_refresh_filename() should simply skip all implicit nodes. They are
supposed to be invisible to the user, so they should not appear in
filename information.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/block.c b/block.c
index 3b72363489..feabe46061 100644
--- a/block.c
+++ b/block.c
@@ -5187,6 +5187,20 @@ void bdrv_refresh_filename(BlockDriverState *bs)
bdrv_refresh_filename(child->bs);
}
+ if (bs->implicit) {
+ /* For implicit nodes, just copy everything from the single child */
+ child = QLIST_FIRST(&bs->children);
+ assert(QLIST_NEXT(child, next) == NULL);
+
+ pstrcpy(bs->exact_filename, sizeof(bs->exact_filename),
+ child->bs->exact_filename);
+ pstrcpy(bs->filename, sizeof(bs->filename), child->bs->filename);
+
+ bs->full_open_options = qobject_ref(child->bs->full_open_options);
+
+ return;
+ }
+
if (drv->bdrv_refresh_filename) {
/* Obsolete information is of no use here, so drop the old file name
* information before refreshing it */
--
2.17.1
- [Qemu-block] [PATCH for-3.1 v10 00/31] block: Fix some filename generation issues, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 02/31] block: Use children list in bdrv_refresh_filename, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 01/31] block: Use bdrv_refresh_filename() to pull, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 03/31] block: Skip implicit nodes for filename info,
Max Reitz <=
- [Qemu-block] [PATCH for-3.1 v10 04/31] block: Add BDS.auto_backing_file, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 06/31] iotests.py: Add filter_imgfmt(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 07/31] iotests.py: Add node_info(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 05/31] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 09/31] block: Make path_combine() return the path, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 08/31] iotests: Add test for backing file overrides, Max Reitz, 2018/08/09