mirror of
https://github.com/qemu/qemu.git
synced 2024-11-29 23:03:41 +08:00
block/nbd: Make bdrv_dirname() return NULL
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 <mreitz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 20190201192935.18394-18-mreitz@redhat.com Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
f3037bd254
commit
8a6239c071
13
block/nbd.c
13
block/nbd.c
@ -528,6 +528,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",
|
||||
@ -546,6 +556,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 = {
|
||||
@ -566,6 +577,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 = {
|
||||
@ -586,6 +598,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)
|
||||
|
Loading…
Reference in New Issue
Block a user