diff options
| author | Max Reitz <mreitz@redhat.com> | 2013-12-20 19:28:17 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-01-22 12:07:18 +0100 |
| commit | 22511ad681348cc4e500ebafdc324b0909d41c95 (patch) | |
| tree | 2eb5a9a2ebe420662a77919838065a8b6270fdfd | |
| parent | 70b6198acc9643c3ce801e5cf4c24274722f2f4a (diff) | |
| download | qemu-22511ad681348cc4e500ebafdc324b0909d41c95.zip qemu-22511ad681348cc4e500ebafdc324b0909d41c95.tar.gz qemu-22511ad681348cc4e500ebafdc324b0909d41c95.tar.bz2 | |
blkverify: Don't require protocol filename
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 <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/blkverify.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |