From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrZaL-0007KI-KK for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:43:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrZaF-00061I-C0 for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:43:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45441) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrZaF-000613-2z for qemu-devel@nongnu.org; Fri, 13 Dec 2013 15:43:39 -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 rBDKhb6p013718 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 15:43:38 -0500 Date: Fri, 13 Dec 2013 21:43:35 +0100 From: Kevin Wolf Message-ID: <20131213204335.GD3916@dhcp-200-207.str.redhat.com> References: <1386954633-28905-1-git-send-email-mreitz@redhat.com> <1386954633-28905-17-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1386954633-28905-17-git-send-email-mreitz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 16/22] blkdebug: Make filename optional List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Fam Zheng , qemu-devel@nongnu.org, Stefan Hajnoczi Am 13.12.2013 um 18:10 hat Max Reitz geschrieben: > There is no problem in giving no filename; in this case, it has to be > specified through the "image" option. > > Signed-off-by: Max Reitz > --- > block/blkdebug.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/block/blkdebug.c b/block/blkdebug.c > index 0c800ae..fdfc6b0 100644 > --- a/block/blkdebug.c > +++ b/block/blkdebug.c > @@ -327,8 +327,10 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, > /* Parse the blkdebug: prefix */ > if (!strstart(filename, "blkdebug:", &filename)) { > /* 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)); > + present in the QDict; if a filename is given, pass it */ > + if (filename) { filename can't be NULL here: For a non-NULL input, strstart() doesn't return NULL, and for a NULL string it segfaults... I don't think we have the segfault case here, because calling bdrv_parse_filename() without having a filename in the first place is quite pointless. I suspect giving no filename has been working even before this patch. > + qdict_put(options, "x-image", qstring_from_str(filename)); > + } > return; > } Having a test case in the commit would show what your intention was (and that the implementation doesn't do that). Kevin