[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v12 23/31] block: Generically refresh runtime option
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v12 23/31] block: Generically refresh runtime options |
Date: |
Mon, 17 Dec 2018 23:43:40 +0100 |
Instead of having every block driver which implements
bdrv_refresh_filename() copy all of the strong runtime options over to
bs->full_open_options, implement this process generically in
bdrv_refresh_filename().
This patch only adds this new generic implementation, it does not remove
the old functionality. This is done in a follow-up patch.
With this patch, some superfluous information (that should never have
been there) may be removed from some JSON filenames, as can be seen in
the change to iotest 110's reference output.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block.c | 116 ++++++++++++++++++++++++++++++++++++-
tests/qemu-iotests/110.out | 2 +-
2 files changed, 116 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 9f1756b1f4..53cb14a5ed 100644
--- a/block.c
+++ b/block.c
@@ -5317,6 +5317,92 @@ out:
return to_replace_bs;
}
+/**
+ * Iterates through the list of runtime option keys that are said to
+ * be "strong" for a BDS. An option is called "strong" if it changes
+ * a BDS's data. For example, the null block driver's "size" and
+ * "read-zeroes" options are strong, but its "latency-ns" option is
+ * not.
+ *
+ * If a key returned by this function ends with a dot, all options
+ * starting with that prefix are strong.
+ */
+static const char *const *strong_options(BlockDriverState *bs,
+ const char *const *curopt)
+{
+ static const char *const global_options[] = {
+ "driver", "filename", NULL
+ };
+
+ if (!curopt) {
+ return &global_options[0];
+ }
+
+ curopt++;
+ if (curopt == &global_options[ARRAY_SIZE(global_options) - 1] && bs->drv) {
+ curopt = bs->drv->strong_runtime_opts;
+ }
+
+ return (curopt && *curopt) ? curopt : NULL;
+}
+
+/**
+ * Copies all strong runtime options from bs->options to the given
+ * QDict. The set of strong option keys is determined by invoking
+ * strong_options().
+ *
+ * Returns true iff any strong option was present in bs->options (and
+ * thus copied to the target QDict) with the exception of "filename"
+ * and "driver". The caller is expected to use this value to decide
+ * whether the existence of strong options prevents the generation of
+ * a plain filename.
+ */
+static bool append_strong_runtime_options(QDict *d, BlockDriverState *bs)
+{
+ bool found_any = false;
+ const char *const *option_name = NULL;
+
+ if (!bs->drv) {
+ return false;
+ }
+
+ while ((option_name = strong_options(bs, option_name))) {
+ bool option_given = false;
+
+ assert(strlen(*option_name) > 0);
+ if ((*option_name)[strlen(*option_name) - 1] != '.') {
+ QObject *entry = qdict_get(bs->options, *option_name);
+ if (!entry) {
+ continue;
+ }
+
+ qdict_put_obj(d, *option_name, qobject_ref(entry));
+ option_given = true;
+ } else {
+ const QDictEntry *entry;
+ for (entry = qdict_first(bs->options); entry;
+ entry = qdict_next(bs->options, entry))
+ {
+ if (strstart(qdict_entry_key(entry), *option_name, NULL)) {
+ qdict_put_obj(d, qdict_entry_key(entry),
+ qobject_ref(qdict_entry_value(entry)));
+ option_given = true;
+ }
+ }
+ }
+
+ /* While "driver" and "filename" need to be included in a JSON
filename,
+ * their existence does not prohibit generation of a plain filename. */
+ if (!found_any && option_given &&
+ strcmp(*option_name, "driver") && strcmp(*option_name, "filename"))
+ {
+ found_any = true;
+ }
+ }
+
+ return found_any;
+}
+
static bool append_open_options(QDict *d, BlockDriverState *bs)
{
const QDictEntry *entry;
@@ -5493,9 +5579,37 @@ void bdrv_refresh_filename(BlockDriverState *bs)
bs->full_open_options = opts;
}
+ /* Gather the options QDict */
+ opts = qdict_new();
+ append_strong_runtime_options(opts, bs);
+
+ if (drv->bdrv_gather_child_options) {
+ /* Some block drivers may not want to present all of their children's
+ * options, or name them differently from BdrvChild.name */
+ drv->bdrv_gather_child_options(bs, opts, backing_overridden);
+ } else {
+ QLIST_FOREACH(child, &bs->children, next) {
+ if (child->role == &child_backing && !backing_overridden) {
+ /* We can skip the backing BDS if it has not been overridden */
+ continue;
+ }
+
+ qdict_put(opts, child->name,
+ qobject_ref(child->bs->full_open_options));
+ }
+
+ if (backing_overridden && !bs->backing) {
+ /* Force no backing file */
+ qdict_put_null(opts, "backing");
+ }
+ }
+
+ qobject_unref(bs->full_open_options);
+ bs->full_open_options = opts;
+
if (bs->exact_filename[0]) {
pstrcpy(bs->filename, sizeof(bs->filename), bs->exact_filename);
- } else if (bs->full_open_options) {
+ } else {
QString *json = qobject_to_json(QOBJECT(bs->full_open_options));
snprintf(bs->filename, sizeof(bs->filename), "json:%s",
qstring_get_str(json));
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
index 1d0b2475cc..46e6a60510 100644
--- a/tests/qemu-iotests/110.out
+++ b/tests/qemu-iotests/110.out
@@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
backing_file=t.IMGFMT.b
=== Nodes without a common directory ===
-image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file",
"filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename":
"TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "blkverify": false,
"rewrite-corrupted": false, "vote-threshold": 1}}
+image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file",
"filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename":
"TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
file format: IMGFMT
virtual size: 64M (67108864 bytes)
backing file: t.IMGFMT.base (cannot determine actual path)
--
2.19.2
- [Qemu-block] [PATCH v12 13/31] block: Fix bdrv_find_backing_image(), (continued)
- [Qemu-block] [PATCH v12 13/31] block: Fix bdrv_find_backing_image(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 14/31] block: Add bdrv_dirname(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 16/31] quorum: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 15/31] blkverify: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 17/31] block/nbd: Make bdrv_dirname() return NULL, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 18/31] block/nfs: Implement bdrv_dirname(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 19/31] block: Use bdrv_dirname() for relative filenames, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 20/31] iotests: Add quorum case to test 110, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 21/31] block: Add strong_runtime_opts to BlockDriver, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 23/31] block: Generically refresh runtime options,
Max Reitz <=
- [Qemu-block] [PATCH v12 25/31] block: Do not copy exact_filename from format file, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 24/31] block: Purify .bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 26/31] block/nvme: Fix bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 27/31] block/curl: Harmonize option defaults, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 28/31] block/curl: Implement bdrv_refresh_filename(), Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 29/31] block/null: Generate filename even with latency-ns, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 30/31] block: BDS options may lack the "driver" option, Max Reitz, 2018/12/17
- [Qemu-block] [PATCH v12 31/31] iotests: Test json:{} filenames of internal BDSs, Max Reitz, 2018/12/17