david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Remove bdrv_new() from bdrv_file_open()

Browse Source 
Change bdrv_file_open() to take a simple pointer to an already existing
BDS instead of an indirect one. The BDS will be created in bdrv_open()
if necessary.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-02-18 18:33:09 +01:00 committed by Kevin Wolf
parent 5d12aa63c7
commit d4446eae63
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
block.c
View File

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