[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 17/24] blkverify: Don't require protocol filename
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v7 17/24] blkverify: Don't require protocol filename |
Date: |
Fri, 20 Dec 2013 19:28:17 +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 (or QMP)
option (like driver=blkverify).
If blkverify_parse_filename() has been called, a filename has been
given. If it is not prefixed, it is probably really just a plain
filename. This is no problem, since we can use it as the test image
filename and rely on the user to specify the raw image filename through
the new corresponding 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 dc14290..a2e8f5f 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.5.1
- [Qemu-devel] [PATCH v7 07/24] blkdebug: Use command-line in read_config(), (continued)
- [Qemu-devel] [PATCH v7 07/24] blkdebug: Use command-line in read_config(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 08/24] block: Allow reference for bdrv_file_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 09/24] block: Pass reference to bdrv_file_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 10/24] block: Allow block devices without files, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 11/24] block: Add bdrv_open_image(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 12/24] block: Use bdrv_open_image() in bdrv_open(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 13/24] block: Allow recursive "file"s, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 15/24] blkdebug: Allow command-line file configuration, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 14/24] blockdev: Move "file" to legacy_opts, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 16/24] blkverify: Allow command-line configuration, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 17/24] blkverify: Don't require protocol filename,
Max Reitz <=
- [Qemu-devel] [PATCH v7 18/24] qapi: Add "errno" to the list of polluted words, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 19/24] qapi: QMP interface for blkdebug and blkverify, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 20/24] qemu-io: Make filename optional, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 21/24] tests: Add test for qdict_array_split(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 22/24] tests: Add test for qdict_flatten(), Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 23/24] iotests: Test new blkdebug/blkverify interface, Max Reitz, 2013/12/20
- [Qemu-devel] [PATCH v7 24/24] iotests: Test file format nesting, Max Reitz, 2013/12/20