From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vtken-000298-4k for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:57:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vtkeg-0000tQ-Oz for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:57:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:19822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vtkeg-0000tL-92 for qemu-devel@nongnu.org; Thu, 19 Dec 2013 15:57:14 -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 rBJKvDLd011905 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 19 Dec 2013 15:57:13 -0500 Message-ID: <52B35DE4.7070100@redhat.com> Date: Thu, 19 Dec 2013 21:58:12 +0100 From: Max Reitz MIME-Version: 1.0 References: <1387482443-10633-1-git-send-email-mreitz@redhat.com> <1387482443-10633-3-git-send-email-mreitz@redhat.com> <52B35D89.4000506@redhat.com> In-Reply-To: <52B35D89.4000506@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v6 02/22] blkdebug: Don't require sophisticated filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi On 19.12.2013 21:56, Eric Blake wrote: > On 12/19/2013 12:47 PM, Max Reitz wrote: >> 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 >> --- >> block/blkdebug.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) > Reviewed-by: Eric Blake > >> diff --git a/block/blkdebug.c b/block/blkdebug.c >> index 627e29d..a2301d7 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)); > Am I correct that x-image is internal use only, and that we aren't > exposing an x- interface to the public user? Yes, this is correct. Max