[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/25] block: Add bdrv_dirname()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v3 10/25] block: Add bdrv_dirname() |
Date: |
Wed, 30 Nov 2016 02:18:36 +0100 |
This function may be implemented by block drivers to derive a directory
name from a BDS. Concatenating this g_free()-able string with a relative
filename must result in a valid (not necessarily existing) filename, so
this is a function that should generally be not implemented by format
drivers, because this is protocol-specific.
If a BDS's driver does not implement this function, bdrv_dirname() will
fall through to the BDS's file if it exists. If it does not, the
exact_filename field will be used to generate a directory name.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 26 ++++++++++++++++++++++++++
include/block/block.h | 1 +
include/block/block_int.h | 1 +
3 files changed, 28 insertions(+)
diff --git a/block.c b/block.c
index de9e661..c48121b 100644
--- a/block.c
+++ b/block.c
@@ -4083,6 +4083,32 @@ void bdrv_refresh_filename(BlockDriverState *bs)
}
}
+char *bdrv_dirname(BlockDriverState *bs, Error **errp)
+{
+ BlockDriver *drv = bs->drv;
+
+ if (!drv) {
+ error_setg(errp, "Node '%s' is ejected", bs->node_name);
+ return NULL;
+ }
+
+ if (drv->bdrv_dirname) {
+ return drv->bdrv_dirname(bs, errp);
+ }
+
+ if (bs->file) {
+ return bdrv_dirname(bs->file->bs, errp);
+ }
+
+ if (bs->exact_filename[0] != '\0') {
+ return path_combine(bs->exact_filename, "");
+ }
+
+ error_setg(errp, "Cannot generate a base directory for %s nodes",
+ drv->format_name);
+ return NULL;
+}
+
/*
* Hot add/remove a BDS's child. So the user can take a child offline when
* it is broken and take a new child online
diff --git a/include/block/block.h b/include/block/block.h
index eb41956..7bcbd05 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -439,6 +439,7 @@ char *bdrv_get_full_backing_filename(BlockDriverState *bs,
Error **errp);
char *bdrv_get_full_backing_filename_from_filename(const char *backed,
const char *backing,
Error **errp);
+char *bdrv_dirname(BlockDriverState *bs, Error **errp);
int path_has_protocol(const char *path);
int path_is_absolute(const char *path);
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 555f3c2..65d6f53 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -130,6 +130,7 @@ struct BlockDriver {
int (*bdrv_make_empty)(BlockDriverState *bs);
void (*bdrv_refresh_filename)(BlockDriverState *bs, QDict *options);
+ char *(*bdrv_dirname)(BlockDriverState *bs, Error **errp);
/* aio */
BlockAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs,
--
2.10.2
- [Qemu-devel] [PATCH v3 00/25] block: Fix some filename generation issues, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 01/25] block/mirror: Small absolute-paths simplification, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 02/25] block: Use children list in bdrv_refresh_filename, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 03/25] block: Add BDS.backing_overridden, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 05/25] block: Make path_combine() return the path, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 07/25] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 08/25] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 04/25] block: Respect backing bs in bdrv_refresh_filename, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 10/25] block: Add bdrv_dirname(),
Max Reitz <=
- [Qemu-devel] [PATCH v3 13/25] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 12/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 14/25] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 16/25] block: Add 'base-directory' BDS option, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 17/25] iotests: Add quorum case to test 110, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 15/25] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 18/25] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 20/25] block: Generically refresh runtime options, Max Reitz, 2016/11/29
- [Qemu-devel] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2016/11/29