[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/24] block: Add 'base-directory' BDS option
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 16/24] block: Add 'base-directory' BDS option |
Date: |
Sun, 27 Nov 2016 02:56:14 +0100 |
Using this option, one can directly override what bdrv_dirname() will
return. This is useful if one uses e.g. qcow2 on top of quorum (with
only protocol BDSs under the quorum BDS) and wants to be able to use
relative backing filenames.
Signed-off-by: Max Reitz <address@hidden>
---
block.c | 14 ++++++++++++++
include/block/block_int.h | 2 ++
qapi/block-core.json | 9 +++++++++
3 files changed, 25 insertions(+)
diff --git a/block.c b/block.c
index b878d66..44412e1 100644
--- a/block.c
+++ b/block.c
@@ -984,6 +984,12 @@ QemuOptsList bdrv_runtime_opts = {
.type = QEMU_OPT_STRING,
.help = "discard operation (ignore/off, unmap/on)",
},
+ {
+ .name = "base-directory",
+ .type = QEMU_OPT_STRING,
+ .help = "String to prepend to filenames relative to this BDS for "
+ "making them absolute",
+ },
{ /* end of list */ }
},
};
@@ -1047,6 +1053,8 @@ static int bdrv_open_common(BlockDriverState *bs,
BdrvChild *file,
goto fail_opts;
}
+ bs->dirname = g_strdup(qemu_opt_get(opts, "base-directory"));
+
bs->read_only = !(bs->open_flags & BDRV_O_RDWR);
if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) {
@@ -2491,6 +2499,8 @@ static void bdrv_delete(BlockDriverState *bs)
bdrv_close(bs);
+ g_free(bs->dirname);
+
/* remove from list, if necessary */
if (bs->node_name[0] != '\0') {
QTAILQ_REMOVE(&graph_bdrv_states, bs, node_list);
@@ -4098,6 +4108,10 @@ char *bdrv_dirname(BlockDriverState *bs, Error **errp)
{
BlockDriver *drv = bs->drv;
+ if (bs->dirname) {
+ return g_strdup(bs->dirname);
+ }
+
if (!drv) {
error_setg(errp, "Node '%s' is ejected", bs->node_name);
return NULL;
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 65d6f53..7143737 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -467,6 +467,8 @@ struct BlockDriverState {
QDict *full_open_options;
char exact_filename[PATH_MAX];
+ char *dirname;
+
BdrvChild *backing;
BdrvChild *file;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index c29bef7..a677483 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -2366,6 +2366,14 @@
# (default: false)
# @detect-zeroes: #optional detect and optimize zero writes (Since 2.1)
# (default: off)
+# @base-directory #optional May be specified for any node. Normally, whenever a
+# filename is specified which is supposed to be relative to
this
+# node (such as relative backing filenames), the base directory
+# to be used is the directory the image file of this node is
in,
+# which is simply prepended to the relative filename. Using
this
+# option, the string which is prepended (i.e. the base
+# directory) can be overridden.
+# (Since 2.9)
#
# Remaining options are determined by the block driver.
#
@@ -2374,6 +2382,7 @@
{ 'union': 'BlockdevOptions',
'base': { 'driver': 'BlockdevDriver',
'*node-name': 'str',
+ '*base-directory': 'str',
'*discard': 'BlockdevDiscardOptions',
'*cache': 'BlockdevCacheOptions',
'*read-only': 'bool',
--
2.10.2
- [Qemu-devel] [PATCH v2 06/24] block: bdrv_get_full_backing_filename_from_...'s ret. val., (continued)
- [Qemu-devel] [PATCH v2 06/24] block: bdrv_get_full_backing_filename_from_...'s ret. val., Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 07/24] block: bdrv_get_full_backing_filename's ret. val., Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 08/24] block: Add bdrv_make_absolute_filename(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 09/24] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 10/24] block: Add bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 11/24] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 12/24] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 13/24] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 14/24] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 15/24] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 16/24] block: Add 'base-directory' BDS option,
Max Reitz <=
- [Qemu-devel] [PATCH v2 17/24] iotests: Add quorum case to test 110, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 18/24] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 20/24] block: Generically refresh runtime options, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 19/24] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 22/24] block: Do not copy exact_filename from format file, Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 21/24] block: Purify .bdrv_refresh_filename(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 23/24] block/curl: Implement bdrv_refresh_filename(), Max Reitz, 2016/11/26
- [Qemu-devel] [PATCH v2 24/24] block/null: Generate filename even with latency-ns, Max Reitz, 2016/11/26