Commit cd5d031e authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

block: Keep "filename" option after parsing 



Currently, bdrv_file_open() always removes the "filename" option from
the options QDict after bdrv_parse_filename() has been (successfully)
called. However, for drivers with bdrv_needs_filename, it makes more
sense for bdrv_parse_filename() to overwrite the "filename" option and
for bdrv_file_open() to fetch the filename from there.

Since there currently are no drivers that implement
bdrv_parse_filename() and have bdrv_needs_filename set, this does not
change current behavior.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarBenoit Canet <benoit@irqsave.net>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 50c75136

block.c

+6 −1
Original line number Diff line number Diff line
@@ -1017,7 +1017,12 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename, 
            ret = -EINVAL;

            goto fail;

        }



        if (!drv->bdrv_needs_filename) {

            qdict_del(*options, "filename");

        } else {

            filename = qdict_get_str(*options, "filename");

        }

    }



    if (!drv->bdrv_file_open) {