From: Max Reitz Date: Fri, 20 Dec 2013 18:28:17 +0000 (+0100) Subject: blkverify: Don't require protocol filename X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=22511ad681348cc4e500ebafdc324b0909d41c95;p=qemu.git 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 Signed-off-by: Kevin Wolf --- diff --git a/block/blkverify.c b/block/blkverify.c index dc14290420..a2e8f5f138 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; }