[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL |
Date: |
Wed, 30 Nov 2016 02:18:37 +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 v3 03/25] block: Add BDS.backing_overridden, (continued)
- [Qemu-block] [PATCH v3 03/25] block: Add BDS.backing_overridden, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 04/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 05/25] block: Make path_combine() return the path, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 07/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 08/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 10/25] block: Add bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 12/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 13/25] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL,
Max Reitz <=
- [Qemu-block] [PATCH v3 14/25] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 15/25] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 16/25] block: Add 'base-directory' BDS option, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 17/25] iotests: Add quorum case to test 110, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 18/25] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 20/25] block: Generically refresh runtime options, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 22/25] block: Do not copy exact_filename from format file, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 21/25] block: Purify .bdrv_refresh_filename(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 23/25] block: Fix FIXME from "Add BDS.backing_overridden", Max Reitz, 2016/11/29