From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWH4-0003r6-8X for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrWGy-0008Ar-8J for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27841) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWGx-00089w-Vb for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:32 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBDHBUPq017345 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 12:11:31 -0500 From: Max Reitz Date: Fri, 13 Dec 2013 18:10:29 +0100 Message-Id: <1386954633-28905-19-git-send-email-mreitz@redhat.com> In-Reply-To: <1386954633-28905-1-git-send-email-mreitz@redhat.com> References: <1386954633-28905-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v5 18/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). Contrary to the current reaction, this is no longer a problem; both images may be specified through the "test" and "raw" options, respectively. If a filename has been given, pass it as the test image filename. Signed-off-by: Max Reitz --- block/blkverify.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/blkverify.c b/block/blkverify.c index 8bf81b5..a903680 100644 --- a/block/blkverify.c +++ b/block/blkverify.c @@ -78,7 +78,11 @@ 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; if a filename is given, pass it */ + if (filename) { + qdict_put(options, "x-image", qstring_from_str(filename)); + } return; } -- 1.8.5.1