diff options
| -rw-r--r-- | block.c | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -960,10 +960,9 @@ free_and_fail: * after the call (even on failure), so if the caller intends to reuse the * dictionary, it needs to use QINCREF() before calling bdrv_file_open. */ -static int bdrv_file_open(BlockDriverState **pbs, const char *filename, +static int bdrv_file_open(BlockDriverState *bs, const char *filename, QDict *options, int flags, Error **errp) { - BlockDriverState *bs = NULL; BlockDriver *drv; const char *drvname; bool allow_protocol_prefix = false; @@ -975,7 +974,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, options = qdict_new(); } - bs = bdrv_new(""); bs->options = options; options = qdict_clone_shallow(options); @@ -1049,7 +1047,6 @@ static int bdrv_file_open(BlockDriverState **pbs, const char *filename, QDECREF(options); bs->growable = 1; - *pbs = bs; return 0; fail: @@ -1057,7 +1054,6 @@ fail: if (!bs->drv) { QDECREF(bs->options); } - bdrv_unref(bs); return ret; } @@ -1252,18 +1248,24 @@ int bdrv_open(BlockDriverState **pbs, const char *filename, return 0; } - if (flags & BDRV_O_PROTOCOL) { - assert(!drv); - return bdrv_file_open(pbs, filename, options, flags & ~BDRV_O_PROTOCOL, - errp); - } - if (*pbs) { bs = *pbs; } else { bs = bdrv_new(""); } + if (flags & BDRV_O_PROTOCOL) { + assert(!drv); + ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL, + errp); + if (ret && !*pbs) { + bdrv_unref(bs); + } else if (!ret) { + *pbs = bs; + } + return ret; + } + /* NULL means an empty set of options */ if (options == NULL) { options = qdict_new(); |