diff options
author | Max Reitz <mreitz@redhat.com> | 2014-03-05 22:41:36 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2014-03-06 16:18:01 +0100 |
commit | cd5d031e75751838fb40f7b5a5f60fc15d543c55 (patch) | |
tree | decbec9693865a316ead103f172b4780e14c408d /block.c | |
parent | 50c75136beec0180171971c88bb6e3fa3aa66463 (diff) | |
download | qemu-cd5d031e75751838fb40f7b5a5f60fc15d543c55.zip qemu-cd5d031e75751838fb40f7b5a5f60fc15d543c55.tar.gz qemu-cd5d031e75751838fb40f7b5a5f60fc15d543c55.tar.bz2 |
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: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Benoit Canet <benoit@irqsave.net>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block.c')
-rw-r--r-- | block.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -1017,7 +1017,12 @@ static int bdrv_file_open(BlockDriverState *bs, const char *filename, ret = -EINVAL; goto fail; } - qdict_del(*options, "filename"); + + if (!drv->bdrv_needs_filename) { + qdict_del(*options, "filename"); + } else { + filename = qdict_get_str(*options, "filename"); + } } if (!drv->bdrv_file_open) { |