[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_o
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_options |
Date: |
Wed, 30 Nov 2016 02:18:45 +0100 |
Some follow-up patches will rework the way bs->full_open_options is
refreshed in bdrv_refresh_filename(). The new implementation will remove
the need for the block drivers' bdrv_refresh_filename() implementations
to set bs->full_open_options; instead, it will be generic and use static
information from each block driver.
However, by implementing bdrv_gather_child_options(), block drivers will
still be able to override the way the full_open_options of their
children are incorporated into their own.
We need to implement this function for VMDK because we have to prevent
the generic implementation from gathering the options of all children:
It is not possible to specify options for the extents through the
runtime options.
For quorum, the child names that would be used by the generic
implementation and the ones that we actually want to use differ. See
quorum_gather_child_options() for more information.
Signed-off-by: Max Reitz <address@hidden>
---
block/quorum.c | 30 ++++++++++++++++++++++++++++++
block/vmdk.c | 13 +++++++++++++
include/block/block_int.h | 1 +
3 files changed, 44 insertions(+)
diff --git a/block/quorum.c b/block/quorum.c
index 0fa803b..126127c 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1083,6 +1083,35 @@ static void quorum_refresh_filename(BlockDriverState
*bs, QDict *options)
bs->full_open_options = opts;
}
+static void quorum_gather_child_options(BlockDriverState *bs, QDict *target)
+{
+ BDRVQuorumState *s = bs->opaque;
+ QList *children_list;
+ int i;
+
+ /* The generic implementation for gathering child options in
+ * bdrv_refresh_filename() would use the names of the children as specified
+ * for bdrv_open_child() or bdrv_attach_child(), which is "children.%u"
with
+ * %u being a value (s->next_child_index) that is incremented each time a
+ * new child is added (and never decremented). Since children can be
deleted
+ * at runtime, there may be gaps in that enumeration. When creating a new
+ * quorum BDS and specifying the children for it through runtime options,
+ * the enumeration used there may not have any gaps, though.
+ *
+ * Therefore, we have to create a new gap-less enumeration here (which we
+ * can achieve by simply putting all of the children's full_open_options
+ * into a QList).
+ */
+
+ children_list = qlist_new();
+ qdict_put(target, "children", children_list);
+
+ for (i = 0; i < s->num_children; i++) {
+ QINCREF(s->children[i]->bs->full_open_options);
+ qlist_append(children_list, s->children[i]->bs->full_open_options);
+ }
+}
+
static char *quorum_dirname(BlockDriverState *bs, Error **errp)
{
/* In general, there are multiple BDSs with different dirnames below this
@@ -1102,6 +1131,7 @@ static BlockDriver bdrv_quorum = {
.bdrv_file_open = quorum_open,
.bdrv_close = quorum_close,
.bdrv_refresh_filename = quorum_refresh_filename,
+ .bdrv_gather_child_options = quorum_gather_child_options,
.bdrv_dirname = quorum_dirname,
.bdrv_co_flush_to_disk = quorum_co_flush,
diff --git a/block/vmdk.c b/block/vmdk.c
index 6f6932a..87ac4f0 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -2287,6 +2287,18 @@ static int vmdk_get_info(BlockDriverState *bs,
BlockDriverInfo *bdi)
return 0;
}
+static void vmdk_gather_child_options(BlockDriverState *bs, QDict *target)
+{
+ /* No children but file and backing can be explicitly specified */
+ QINCREF(bs->file->bs->full_open_options);
+ qdict_put(target, "file", bs->file->bs->full_open_options);
+
+ if (bs->backing_overridden) {
+ QINCREF(bs->backing->bs->full_open_options);
+ qdict_put(target, "backing", bs->backing->bs->full_open_options);
+ }
+}
+
static QemuOptsList vmdk_create_opts = {
.name = "vmdk-create-opts",
.head = QTAILQ_HEAD_INITIALIZER(vmdk_create_opts.head),
@@ -2356,6 +2368,7 @@ static BlockDriver bdrv_vmdk = {
.bdrv_get_specific_info = vmdk_get_specific_info,
.bdrv_refresh_limits = vmdk_refresh_limits,
.bdrv_get_info = vmdk_get_info,
+ .bdrv_gather_child_options = vmdk_gather_child_options,
.supports_backing = true,
.create_opts = &vmdk_create_opts,
diff --git a/include/block/block_int.h b/include/block/block_int.h
index 5885d9f..cfb8cf3 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);
+ void (*bdrv_gather_child_options)(BlockDriverState *bs, QDict *target);
char *(*bdrv_dirname)(BlockDriverState *bs, Error **errp);
/* aio */
--
2.10.2
- [Qemu-block] [PATCH v3 09/25] block: Fix bdrv_find_backing_image(), (continued)
- [Qemu-block] [PATCH v3 09/25] block: Fix bdrv_find_backing_image(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 10/25] block: Add bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 12/25] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 13/25] block/nbd: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 11/25] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 14/25] block/nfs: Implement bdrv_dirname(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 15/25] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 16/25] block: Add 'base-directory' BDS option, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 17/25] iotests: Add quorum case to test 110, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 18/25] block: Add sgfnt_runtime_opts to BlockDriver, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 19/25] block: Add BlockDriver.bdrv_gather_child_options,
Max Reitz <=
- [Qemu-block] [PATCH v3 20/25] block: Generically refresh runtime options, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 22/25] block: Do not copy exact_filename from format file, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 21/25] block: Purify .bdrv_refresh_filename(), Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 23/25] block: Fix FIXME from "Add BDS.backing_overridden", Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 25/25] block/null: Generate filename even with latency-ns, Max Reitz, 2016/11/29
- [Qemu-block] [PATCH v3 24/25] block/curl: Implement bdrv_refresh_filename(), Max Reitz, 2016/11/29