[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 12/25] quorum: Make bdrv_dirname() return NULL
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 12/25] quorum: Make bdrv_dirname() return NULL |
Date: |
Wed, 21 Jun 2017 14:50:34 +0200 |
While the common implementation for bdrv_dirname() should return NULL
for quorum BDSs already (because they do not have a file node and their
exact_filename field should be empty), there is no reason not to make
that explicit.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/quorum.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/block/quorum.c b/block/quorum.c
index f39b9e5..1e40b9e 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1108,6 +1108,16 @@ static void quorum_refresh_filename(BlockDriverState
*bs, QDict *options)
bs->full_open_options = opts;
}
+static char *quorum_dirname(BlockDriverState *bs, Error **errp)
+{
+ /* In general, there are multiple BDSs with different dirnames below this
+ * one; so there is no unique dirname we could return (unless all are equal
+ * by chance, or there is only one). Therefore, to be consistent, just
+ * always return NULL. */
+ error_setg(errp, "Cannot generate a base directory for quorum nodes");
+ return NULL;
+}
+
static BlockDriver bdrv_quorum = {
.format_name = "quorum",
.protocol_name = "quorum",
@@ -1117,6 +1127,7 @@ static BlockDriver bdrv_quorum = {
.bdrv_file_open = quorum_open,
.bdrv_close = quorum_close,
.bdrv_refresh_filename = quorum_refresh_filename,
+ .bdrv_dirname = quorum_dirname,
.bdrv_co_flush_to_disk = quorum_co_flush,
--
2.9.4
- [Qemu-block] [PATCH v5 03/25] block: Add BDS.backing_overridden, (continued)
- [Qemu-block] [PATCH v5 03/25] block: Add BDS.backing_overridden, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 04/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 05/25] block: Make path_combine() return the path, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 08/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 07/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 10/25] block: Add bdrv_dirname(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 13/25] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 11/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 12/25] quorum: Make bdrv_dirname() return NULL,
Max Reitz <=
- [Qemu-block] [PATCH v5 14/25] block/nfs: Implement bdrv_dirname(), Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 15/25] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 16/25] block: Add 'base-directory' BDS option, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 17/25] iotests: Add quorum case to test 110, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 19/25] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 18/25] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 20/25] block: Generically refresh runtime options, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 22/25] block: Do not copy exact_filename from format file, Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 23/25] block: Fix FIXME from "Add BDS.backing_overridden", Max Reitz, 2017/06/21
- [Qemu-block] [PATCH v5 21/25] block: Purify .bdrv_refresh_filename(), Max Reitz, 2017/06/21