[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 16/21] block: reopen: Extract QemuOpts for generi
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 16/21] block: reopen: Extract QemuOpts for generic block layer options |
Date: |
Mon, 23 Nov 2015 16:59:55 +0100 |
This patch adds a QemuOpts for generic block layer options to
bdrv_reopen_prepare(). The only two options that currently exist
(node-name and driver) cannot be changed, so the only thing we do is
putting them right back into the QDict so that we check at the end that
they are indeed unchanged.
We will add new options soon that can actually be changed.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
block.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/block.c b/block.c
index e718fd8..eff0c19 100644
--- a/block.c
+++ b/block.c
@@ -1907,11 +1907,34 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
int ret = -1;
Error *local_err = NULL;
BlockDriver *drv;
+ QemuOpts *opts;
+ const char *value;
assert(reopen_state != NULL);
assert(reopen_state->bs->drv != NULL);
drv = reopen_state->bs->drv;
+ /* Process generic block layer options */
+ opts = qemu_opts_create(&bdrv_runtime_opts, NULL, 0, &error_abort);
+ qemu_opts_absorb_qdict(opts, reopen_state->options, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ ret = -EINVAL;
+ goto error;
+ }
+
+ /* node-name and driver must be unchanged. Put them back into the QDict, so
+ * that they are checked at the end of this function. */
+ value = qemu_opt_get(opts, "node-name");
+ if (value) {
+ qdict_put(reopen_state->options, "node-name", qstring_from_str(value));
+ }
+
+ value = qemu_opt_get(opts, "driver");
+ if (value) {
+ qdict_put(reopen_state->options, "driver", qstring_from_str(value));
+ }
+
/* if we are to stay read-only, do not allow permission change
* to r/w */
if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
@@ -1972,6 +1995,7 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state,
BlockReopenQueue *queue,
ret = 0;
error:
+ qemu_opts_del(opts);
return ret;
}
--
1.8.3.1
- Re: [Qemu-devel] [PATCH v2 14/21] blockdev: Set 'format' indicates non-empty drive, (continued)
- [Qemu-devel] [PATCH v2 12/21] block: Split out parse_json_protocol(), Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 09/21] block: Allow specifying child options in reopen, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 13/21] block: Introduce bs->explicit_options, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 01/21] qcow2: Add .bdrv_join_options callback, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 15/21] qemu-iotests: Remove cache mode test without medium, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 16/21] block: reopen: Extract QemuOpts for generic block layer options,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 11/21] block: Add infrastructure for option inheritance, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 17/21] block: Move cache options into options QDict, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 04/21] block: Allow references for backing files, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 18/21] blkdebug: Enable reopen, Kevin Wolf, 2015/11/23
- [Qemu-devel] [PATCH v2 19/21] qemu-iotests: Try setting cache mode for children, Kevin Wolf, 2015/11/23