From patchwork Wed Dec 11 18:11:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 300256 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D64822C00A1 for ; Thu, 12 Dec 2013 05:18:41 +1100 (EST) Received: from localhost ([::1]:59190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqoMp-0004KU-8t for incoming@patchwork.ozlabs.org; Wed, 11 Dec 2013 13:18:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqoFe-0001nR-BF for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:11:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VqoFY-0002Jo-CK for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:11:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VqoFY-0002Ji-4n for qemu-devel@nongnu.org; Wed, 11 Dec 2013 13:11:08 -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 rBBIB740012994 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 11 Dec 2013 13:11:07 -0500 Received: from localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBBIB4NP024429 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Wed, 11 Dec 2013 13:11:06 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Wed, 11 Dec 2013 19:11:07 +0100 Message-Id: <1386785473-26157-16-git-send-email-mreitz@redhat.com> In-Reply-To: <1386785473-26157-1-git-send-email-mreitz@redhat.com> References: <1386785473-26157-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v3 15/21] blkdebug: Make filename optional X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 b032fff..6b59216 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; }