From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vtja2-0006Bn-PL for qemu-devel@nongnu.org; Thu, 19 Dec 2013 14:48:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VtjZg-00056g-Ig for qemu-devel@nongnu.org; Thu, 19 Dec 2013 14:48:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27662) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VtjZg-00056Q-BA for qemu-devel@nongnu.org; Thu, 19 Dec 2013 14:48:00 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBJJlwEn018293 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Dec 2013 14:47:59 -0500 From: Max Reitz Date: Thu, 19 Dec 2013 20:47:18 +0100 Message-Id: <1387482443-10633-18-git-send-email-mreitz@redhat.com> In-Reply-To: <1387482443-10633-1-git-send-email-mreitz@redhat.com> References: <1387482443-10633-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 17/22] blkverify: Don't require protocol filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz 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 --- block/blkverify.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/blkverify.c b/block/blkverify.c index 19a5179..0c6393b 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