[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/5] block: Keep "filename" option after parsing
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 1/5] block: Keep "filename" option after parsing |
Date: |
Wed, 5 Mar 2014 22:41:36 +0100 |
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>
---
block.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index f01b91c..845cbfb 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.9.0
- [Qemu-devel] [PATCH 0/5] block/raw: Strip "file:" prefix from filenames, Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 1/5] block: Keep "filename" option after parsing,
Max Reitz <=
- [Qemu-devel] [PATCH 2/5] block/raw-posix: Implement bdrv_parse_filename(), Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 3/5] block/raw-posix: Strip "file:" prefix on creation, Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 4/5] block/raw-win32: Implement bdrv_parse_filename(), Max Reitz, 2014/03/05
- [Qemu-devel] [PATCH 5/5] block/raw-win32: Strip "file:" prefix on creation, Max Reitz, 2014/03/05
- Re: [Qemu-devel] [PATCH 0/5] block/raw: Strip "file:" prefix from filenames, Eric Blake, 2014/03/05