[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 17/31] block/nbd: Make bdrv_dirname() return NULL
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v9 17/31] block/nbd: Make bdrv_dirname() return NULL |
Date: |
Thu, 28 Jun 2018 02:07:31 +0200 |
The generic bdrv_dirname() implementation would be able to generate some
form of directory name for many NBD nodes, but it would be always wrong.
Therefore, we have to explicitly make it an error (until NBD has some
form of specification for export paths, if it ever will).
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block/nbd.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 13db4030e6..0cd5865558 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -558,6 +558,16 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
bs->full_open_options = opts;
}
+static char *nbd_dirname(BlockDriverState *bs, Error **errp)
+{
+ /* The generic bdrv_dirname() implementation is able to work out some
+ * directory name for NBD nodes, but that would be wrong. So far there is
no
+ * specification for how "export paths" would work, so NBD does not have
+ * directory names. */
+ error_setg(errp, "Cannot generate a base directory for NBD nodes");
+ return NULL;
+}
+
static BlockDriver bdrv_nbd = {
.format_name = "nbd",
.protocol_name = "nbd",
@@ -576,6 +586,7 @@ static BlockDriver bdrv_nbd = {
.bdrv_attach_aio_context = nbd_attach_aio_context,
.bdrv_refresh_filename = nbd_refresh_filename,
.bdrv_co_block_status = nbd_client_co_block_status,
+ .bdrv_dirname = nbd_dirname,
};
static BlockDriver bdrv_nbd_tcp = {
@@ -596,6 +607,7 @@ static BlockDriver bdrv_nbd_tcp = {
.bdrv_attach_aio_context = nbd_attach_aio_context,
.bdrv_refresh_filename = nbd_refresh_filename,
.bdrv_co_block_status = nbd_client_co_block_status,
+ .bdrv_dirname = nbd_dirname,
};
static BlockDriver bdrv_nbd_unix = {
@@ -616,6 +628,7 @@ static BlockDriver bdrv_nbd_unix = {
.bdrv_attach_aio_context = nbd_attach_aio_context,
.bdrv_refresh_filename = nbd_refresh_filename,
.bdrv_co_block_status = nbd_client_co_block_status,
+ .bdrv_dirname = nbd_dirname,
};
static void bdrv_nbd_init(void)
--
2.17.1
- [Qemu-devel] [PATCH v9 06/31] iotests.py: Add filter_imgfmt(), (continued)
- [Qemu-devel] [PATCH v9 06/31] iotests.py: Add filter_imgfmt(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 07/31] iotests.py: Add node_info(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 08/31] iotests: Add test for backing file overrides, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 09/31] block: Make path_combine() return the path, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 12/31] block: Add bdrv_make_absolute_filename(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 11/31] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 10/31] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 13/31] block: Fix bdrv_find_backing_image(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 15/31] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 17/31] block/nbd: Make bdrv_dirname() return NULL,
Max Reitz <=
- [Qemu-devel] [PATCH v9 16/31] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 14/31] block: Add bdrv_dirname(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 18/31] block/nfs: Implement bdrv_dirname(), Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 19/31] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 20/31] iotests: Add quorum case to test 110, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 21/31] block: Add strong_runtime_opts to BlockDriver, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 23/31] block: Generically refresh runtime options, Max Reitz, 2018/06/27
- [Qemu-devel] [PATCH v9 25/31] block: Do not copy exact_filename from format file, Max Reitz, 2018/06/27