From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWGv-0003Xu-0z for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrWGp-00087n-1U for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWGo-00087a-PT for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:11:22 -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 rBDHBKVx021460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 12:11:21 -0500 From: Max Reitz Date: Fri, 13 Dec 2013 18:10:27 +0100 Message-Id: <1386954633-28905-17-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 16/22] blkdebug: Make filename optional 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 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) { + qdict_put(options, "x-image", qstring_from_str(filename)); + } return; } -- 1.8.5.1