[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing |
Date: |
Fri, 7 Mar 2014 14:32:57 +0100 |
From: Max Reitz <address@hidden>
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Benoit Canet <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index 7330a87..e7387f1 100644
--- a/block.c
+++ b/block.c
@@ -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) {
--
1.8.1.4
- [Qemu-devel] [PULL 00/19] Block patches, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 01/19] gluster: Change licence to GPLv2+, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 03/19] qemu-img convert: Fix progress output, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 04/19] qemu-iotests: Test progress output for conversion, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 02/19] gluster: Remove unused defines and header include, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 05/19] iscsi: Use bs->sg for everything else than disks, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 06/19] block: Fix bs->request_alignment assertion for bs->sg=1, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 07/19] block: make bdrv_swap rebuild the bs graph node list field., Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 08/19] block: mirror - remove code cruft that has no function, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 09/19] block: Keep "filename" option after parsing,
Kevin Wolf <=
- [Qemu-devel] [PULL 10/19] block/raw-posix: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 12/19] block/raw-win32: Implement bdrv_parse_filename(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 11/19] block/raw-posix: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 13/19] block/raw-win32: Strip "file:" prefix on creation, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 15/19] blockdev: Fix NULL pointer dereference in blockdev-add, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 16/19] qemu-iotests: Test a few blockdev-add error cases, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 14/19] blockdev: Fail blockdev-add with encrypted images, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 17/19] block: Fix error path segfault in bdrv_open(), Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 19/19] block: qemu-iotests 085 - live snapshots tests, Kevin Wolf, 2014/03/07
- [Qemu-devel] [PULL 18/19] hw/ide/ahci.h: Avoid shifting left into sign bit, Kevin Wolf, 2014/03/07