From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjZZY-0004aU-1V for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:05:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjZZN-0006sY-R1 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:05:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjZZN-0006sT-CS for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:05:41 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rALJ5dZ0024534 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 21 Nov 2013 14:05:40 -0500 From: Max Reitz Date: Thu, 21 Nov 2013 20:05:50 +0100 Message-Id: <1385060754-18821-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1385060754-18821-1-git-send-email-mreitz@redhat.com> References: <1385060754-18821-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] blkdebug: Don't require sophisticated filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , 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 --- block/blkdebug.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index 76f80c0..59d33a8 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -315,7 +315,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.4.2