[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL |
Date: |
Sun, 27 Nov 2016 02:56:09 +0100 |
blkverify's BDSs have a file BDS, but we do not want this to be
preferred over the raw node. There is no way to decide between the two
(and not really a reason to, either), so just return NULL in blkverify's
implementation of bdrv_dirname().
Signed-off-by: Max Reitz <address@hidden>
---
block/blkverify.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/block/blkverify.c b/block/blkverify.c
index e0f9275..d6e57e0 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -318,6 +318,15 @@ static void blkverify_refresh_filename(BlockDriverState
*bs, QDict *options)
}
}
+static char *blkverify_dirname(BlockDriverState *bs, Error **errp)
+{
+ /* In general, there are two BDSs with different dirnames below this one;
+ * so there is no unique dirname we could return (unless both are equal by
+ * chance). Therefore, to be consistent, just always return NULL. */
+ error_setg(errp, "Cannot generate a base directory for blkverify nodes");
+ return NULL;
+}
+
static BlockDriver bdrv_blkverify = {
.format_name = "blkverify",
.protocol_name = "blkverify",
@@ -328,6 +337,7 @@ static BlockDriver bdrv_blkverify = {
.bdrv_close = blkverify_close,
.bdrv_getlength = blkverify_getlength,
.bdrv_refresh_filename = blkverify_refresh_filename,
+ .bdrv_dirname = blkverify_dirname,
.bdrv_aio_readv = blkverify_aio_readv,
.bdrv_aio_writev = blkverify_aio_writev,
--
2.10.2
- [Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_filename, (continued)
- [Qemu-block] [PATCH v2 02/24] block: Use children list in bdrv_refresh_filename, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 03/24] block: Add BDS.backing_overridden, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 05/24] block: Make path_combine() return the path, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 04/24] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 06/24] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 07/24] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 09/24] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 10/24] block: Add bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL,
Max Reitz <=
- [Qemu-block] [PATCH v2 12/24] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 13/24] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 14/24] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 15/24] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 16/24] block: Add 'base-directory' BDS option, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 17/24] iotests: Add quorum case to test 110, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 18/24] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 19/24] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 20/24] block: Generically refresh runtime options, Max Reitz, 2016/11/26
- [Qemu-block] [PATCH v2 22/24] block: Do not copy exact_filename from format file, Max Reitz, 2016/11/26