[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v12 25/31] block: Do not copy exact_filename from fo
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v12 25/31] block: Do not copy exact_filename from format file |
Date: |
Mon, 17 Dec 2018 23:43:42 +0100 |
If a format BDS's file BDS is in turn a format BDS, we cannot simply use
the same filename, because when opening a BDS tree based on a filename
alone, qemu will create only one format node on top of one protocol node
(disregarding a potential backing file).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/block.c b/block.c
index c8399a9036..44bebfc80c 100644
--- a/block.c
+++ b/block.c
@@ -5513,9 +5513,21 @@ void bdrv_refresh_filename(BlockDriverState *bs)
bs->exact_filename[0] = '\0';
- /* If no specific options have been given for this BDS, the filename of
- * the underlying file should suffice for this one as well */
- if (bs->file->bs->exact_filename[0] && !generate_json_filename) {
+ /*
+ * We can use the underlying file's filename if:
+ * - it has a filename,
+ * - the file is a protocol BDS, and
+ * - opening that file (as this BDS's format) will automatically create
+ * the BDS tree we have right now, that is:
+ * - the user did not significantly change this BDS's behavior with
+ * some explicit (strong) options
+ * - no non-file child of this BDS has been overridden by the user
+ * Both of these conditions are represented by
generate_json_filename.
+ */
+ if (bs->file->bs->exact_filename[0] &&
+ bs->file->bs->drv->bdrv_file_open &&
+ !generate_json_filename)
+ {
strcpy(bs->exact_filename, bs->file->bs->exact_filename);
}
}
--
2.19.2
- [Qemu-block] [PATCH v12 14/31] block: Add bdrv_dirname(), (continued)
- [Qemu-block] [PATCH v12 14/31] block: Add bdrv_dirname(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 16/31] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 15/31] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 17/31] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 18/31] block/nfs: Implement bdrv_dirname(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 19/31] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 20/31] iotests: Add quorum case to test 110, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 21/31] block: Add strong_runtime_opts to BlockDriver, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 23/31] block: Generically refresh runtime options, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 25/31] block: Do not copy exact_filename from format file,
Max Reitz <=
- [Qemu-block] [PATCH v12 24/31] block: Purify .bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 26/31] block/nvme: Fix bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 27/31] block/curl: Harmonize option defaults, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 28/31] block/curl: Implement bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 29/31] block/null: Generate filename even with latency-ns, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 30/31] block: BDS options may lack the "driver" option, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 31/31] iotests: Test json:{} filenames of internal BDSs, Max Reitz, 2018/12/17