From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3NdE-0007c4-MQ for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3Nd8-0000p9-JU for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3Nd8-0000oo-Bw for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:26 -0500 From: Kevin Wolf Date: Wed, 15 Jan 2014 11:22:32 +0100 Message-Id: <1389781375-11774-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1389781375-11774-1-git-send-email-kwolf@redhat.com> References: <1389781375-11774-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 19/42] blkdebug: Don't require sophisticated filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz If the filename is not prefixed by "blkdebug:" in blkdebug_parse_filename(), the blkdebug driver was not selected through that protocol prefix, but by an explicit command line option (file.driver=blkdebug or something similar). Contrary to the current reaction, this is not a problem at all; we just need to store the filename (in the x-image option) and can go on; the user just has to manually specify the config option. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/blkdebug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 2eb2e8b..fab76ce 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -313,7 +313,9 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, /* Parse the blkdebug: prefix */ if (!strstart(filename, "blkdebug:", &filename)) { - error_setg(errp, "File name string must start with 'blkdebug:'"); + /* 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.1.4