[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] blkverify: Don't require protocol filename
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 7/7] blkverify: Don't require protocol filename |
Date: |
Fri, 22 Nov 2013 17:10:58 +0100 |
If the filename is not prefixed by "blkverify:" in
blkverify_parse_filename(), the blkverify driver was not selected
through that protocol prefix, but by an explicit command line option
(like file.driver=blkverify). Contrary to the current reaction, this is
not really a problem; the whole filename just has to be stored (in the
x-image option) and the user has to manually specify the x-raw option.
Signed-off-by: Max Reitz <address@hidden>
---
block/blkverify.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/blkverify.c b/block/blkverify.c
index 3c63528..bdbdd68 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -78,7 +78,9 @@ static void blkverify_parse_filename(const char *filename,
QDict *options,
/* Parse the blkverify: prefix */
if (!strstart(filename, "blkverify:", &filename)) {
- error_setg(errp, "File name string must start with 'blkverify:'");
+ /* There was no prefix; therefore, all options have to be already
+ present in the QDict (except for the filename) */
+ qdict_put(options, "x-image", qstring_from_str(filename));
return;
}
--
1.8.4.2
- [Qemu-devel] [PATCH v2 0/7] blkdebug/blkverify: Allow command-line configuration, Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 1/7] blkdebug: Use errp for read_config(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 2/7] blkdebug: Don't require sophisticated filename, Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 3/7] qdict: Add qdict_array_split(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 4/7] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 5/7] blkdebug: Always call read_config(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 6/7] blkdebug: Use command-line in read_config(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 7/7] blkverify: Don't require protocol filename,
Max Reitz <=