aboutsummaryrefslogtreecommitdiff
path: root/block.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2014-05-26 11:39:55 +0200
committerKevin Wolf <kwolf@redhat.com>2014-06-26 13:51:01 +0200
commit462f5bcf69d3cae4a93ad55bee59516c15236a55 (patch)
tree27eaa381e59644bf1e875bb21250195eab014580 /block.c
parentf54120ff1aa030d96ee64aefef9898e9e80b3a71 (diff)
block: Move bdrv_fill_options() call to bdrv_open()
bs->options now contains the modified version of the options. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r--block.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/block.c b/block.c
index 757d139a1f..0da39e6811 100644
--- a/block.c
+++ b/block.c
@@ -1009,14 +1009,19 @@ free_and_fail:
* Fills in default options for opening images and converts the legacy
* filename/flags pair to option QDict entries.
*/
-static int bdrv_fill_options(QDict **options, const char *filename,
+static int bdrv_fill_options(QDict **options, const char *filename, int flags,
Error **errp)
{
const char *drvname;
+ bool protocol = flags & BDRV_O_PROTOCOL;
bool parse_filename = false;
Error *local_err = NULL;
BlockDriver *drv;
+ if (!protocol) {
+ return 0;
+ }
+
/* Fetch the file name from the options QDict if necessary */
if (filename) {
if (!qdict_haskey(*options, "filename")) {
@@ -1081,20 +1086,15 @@ static int bdrv_fill_options(QDict **options, const char *filename,
* returns. Then, the caller is responsible for freeing it. If it intends to
* reuse the QDict, QINCREF() should be called beforehand.
*/
-static int bdrv_file_open(BlockDriverState *bs, const char *filename,
- QDict **options, int flags, Error **errp)
+static int bdrv_file_open(BlockDriverState *bs, QDict **options, int flags,
+ Error **errp)
{
BlockDriver *drv;
+ const char *filename;
const char *drvname;
Error *local_err = NULL;
int ret;
- ret = bdrv_fill_options(options, filename, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- goto fail;
- }
-
filename = qdict_get_try_str(*options, "filename");
drvname = qdict_get_str(*options, "driver");
@@ -1436,12 +1436,17 @@ int bdrv_open(BlockDriverState **pbs, const char *filename,
filename = NULL;
}
+ ret = bdrv_fill_options(&options, filename, flags, &local_err);
+ if (local_err) {
+ goto fail;
+ }
+
bs->options = options;
options = qdict_clone_shallow(options);
if (flags & BDRV_O_PROTOCOL) {
assert(!drv);
- ret = bdrv_file_open(bs, filename, &options, flags & ~BDRV_O_PROTOCOL,
+ ret = bdrv_file_open(bs, &options, flags & ~BDRV_O_PROTOCOL,
&local_err);
if (!ret) {
drv = bs->drv;