motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 08:17:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: Drop drv parameter from bdrv_open_inherit()

Browse source 
Now that this parameter is effectively unused, we can drop it and just
pass NULL to bdrv_fill_options().

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2015-08-26 19:47:50 +02:00 • committed by Kevin Wolf
parent 6ebf9aa2ef
commit ce34377124
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
block.c
View file

@ -85,8 +85,7 @@ static QLIST_HEAD(, BlockDriver) bdrv_drivers =
static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename, static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
const char *reference, QDict *options, int flags, const char *reference, QDict *options, int flags,
BlockDriverState *parent, BlockDriverState *parent,
const BdrvChildRole *child_role, const BdrvChildRole *child_role, Error **errp);
BlockDriver *drv, Error **errp);
static void bdrv_dirty_bitmap_truncate(BlockDriverState *bs); static void bdrv_dirty_bitmap_truncate(BlockDriverState *bs);
/* If non-zero, use only whitelisted block drivers */ /* If non-zero, use only whitelisted block drivers */
@ -1227,8 +1226,7 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp)
assert(bs->backing_hd == NULL); assert(bs->backing_hd == NULL);
ret = bdrv_open_inherit(&backing_hd, ret = bdrv_open_inherit(&backing_hd,
*backing_filename ? backing_filename : NULL, *backing_filename ? backing_filename : NULL,
NULL, options, 0, bs, &child_backing, NULL, options, 0, bs, &child_backing, &local_err);
NULL, &local_err);
if (ret < 0) { if (ret < 0) {
bdrv_unref(backing_hd); bdrv_unref(backing_hd);
backing_hd = NULL; backing_hd = NULL;
@ -1291,7 +1289,7 @@ BdrvChild *bdrv_open_child(const char *filename,
bs = NULL; bs = NULL;
ret = bdrv_open_inherit(&bs, filename, reference, image_options, 0, ret = bdrv_open_inherit(&bs, filename, reference, image_options, 0,
parent, child_role, NULL, errp); parent, child_role, errp);
if (ret < 0) { if (ret < 0) {
goto done; goto done;
} }
@ -1422,11 +1420,11 @@ out:
static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename, static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
const char *reference, QDict *options, int flags, const char *reference, QDict *options, int flags,
BlockDriverState *parent, BlockDriverState *parent,
const BdrvChildRole *child_role, const BdrvChildRole *child_role, Error **errp)
BlockDriver *drv, Error **errp)
{ {
int ret; int ret;
BlockDriverState *file = NULL, *bs; BlockDriverState *file = NULL, *bs;
BlockDriver *drv = NULL;
const char *drvname; const char *drvname;
Error *local_err = NULL; Error *local_err = NULL;
int snapshot_flags = 0; int snapshot_flags = 0;
@ -1476,13 +1474,12 @@ static int bdrv_open_inherit(BlockDriverState **pbs, const char *filename,
flags = child_role->inherit_flags(parent->open_flags); flags = child_role->inherit_flags(parent->open_flags);
} }
ret = bdrv_fill_options(&options, &filename, &flags, drv, &local_err); ret = bdrv_fill_options(&options, &filename, &flags, NULL, &local_err);
if (local_err) { if (local_err) {
goto fail; goto fail;
} }
/* Find the right image format driver */ /* Find the right image format driver */
drv = NULL;
drvname = qdict_get_try_str(options, "driver"); drvname = qdict_get_try_str(options, "driver");
if (drvname) { if (drvname) {
drv = bdrv_find_format(drvname); drv = bdrv_find_format(drvname);
@ -1640,7 +1637,7 @@ int bdrv_open(BlockDriverState **pbs, const char *filename,
const char *reference, QDict *options, int flags, Error **errp) const char *reference, QDict *options, int flags, Error **errp)
{ {
return bdrv_open_inherit(pbs, filename, reference, options, flags, NULL, return bdrv_open_inherit(pbs, filename, reference, options, flags, NULL,
NULL, NULL, errp); NULL, errp);
} }
typedef struct BlockReopenQueueEntry { typedef struct BlockReopenQueueEntry {