mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: reopen: Extract QemuOpts for generic block layer options

Browse Source 
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 <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Kevin Wolf 2015-05-08 17:24:56 +02:00
parent fc17c25931
commit ccf9dc07b5
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block.c
View File

@ -1907,11 +1907,34 @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
int ret = -1; int ret = -1;
Error *local_err = NULL; Error *local_err = NULL;
BlockDriver *drv; BlockDriver *drv;
QemuOpts *opts;
const char *value;
assert(reopen_state != NULL); assert(reopen_state != NULL);
assert(reopen_state->bs->drv != NULL); assert(reopen_state->bs->drv != NULL);
drv = reopen_state->bs->drv; 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 /* if we are to stay read-only, do not allow permission change
* to r/w */ * to r/w */
if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) && 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; ret = 0;
error: error:
qemu_opts_del(opts);
return ret; return ret;
} }