ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: Handle bs->options in bdrv_open() only 

The fail paths of bdrv_file_open() and bdrv_open() naturally exhibit
similarities, thus it is possible to reuse the one from bdrv_open() and
shorten the one in bdrv_file_open() accordingly.

Also, setting bs->options in bdrv_file_open() is not necessary if it is
already done in bdrv_open().

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:10 +01:00 committed by Kevin Wolf
parent d4446eae63
commit 5469a2a688
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
block.c
View File

@ -969,14 +969,6 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename,
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
/* NULL means an empty set of options */
if (options == NULL) {
options = qdict_new();
}
bs->options = options;
options = qdict_clone_shallow(options);
/* Fetch the file name from the options QDict if necessary */ /* Fetch the file name from the options QDict if necessary */
if (!filename) { if (!filename) {
filename = qdict_get_try_str(options, "filename"); filename = qdict_get_try_str(options, "filename");
@ -1051,9 +1043,6 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename,
fail: fail:
QDECREF(options); QDECREF(options);
if (!bs->drv) {
QDECREF(bs->options);
}
return ret; return ret;
} }
@ -1254,18 +1243,6 @@ int bdrv_open(BlockDriverState **pbs, const char *filename,
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();
@ -1274,6 +1251,21 @@ int bdrv_open(BlockDriverState **pbs, const char *filename,
bs->options = options; bs->options = options;
options = qdict_clone_shallow(options); options = qdict_clone_shallow(options);
if (flags & BDRV_O_PROTOCOL) {
assert(!drv);
ret = bdrv_file_open(bs, filename, options, flags & ~BDRV_O_PROTOCOL,
&local_err);
options = NULL;
if (!ret) {
*pbs = bs;
return 0;
} else if (bs->drv) {
goto close_and_fail;
} else {
goto fail;
}
}
/* For snapshot=on, create a temporary qcow2 overlay */ /* For snapshot=on, create a temporary qcow2 overlay */
if (flags & BDRV_O_SNAPSHOT) { if (flags & BDRV_O_SNAPSHOT) {
BlockDriverState *bs1; BlockDriverState *bs1;