From patchwork Fri Dec 13 17:10:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 301104 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 90EB12C008F for ; Sat, 14 Dec 2013 04:13:22 +1100 (EST) Received: from localhost ([::1]:43795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWIh-0005Dl-RX for incoming@patchwork.ozlabs.org; Fri, 13 Dec 2013 12:13:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWFy-0002DJ-WF for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:10:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VrWFt-0007wR-0D for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:10:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:30234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VrWFs-0007wD-Ni for qemu-devel@nongnu.org; Fri, 13 Dec 2013 12:10:24 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBDHANgK026397 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 12:10:23 -0500 Received: from localhost (ovpn-116-117.ams2.redhat.com [10.36.116.117]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBDHAJrI018699 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 13 Dec 2013 12:10:22 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Fri, 13 Dec 2013 18:10:18 +0100 Message-Id: <1386954633-28905-8-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 v5 07/22] blkdebug: Always call read_config() 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 Move the check whether there actually is a config file into the read_config() function. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf --- block/blkdebug.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index a2301d7..5647467 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -273,21 +273,23 @@ static void remove_rule(BlkdebugRule *rule) static int read_config(BDRVBlkdebugState *s, const char *filename, Error **errp) { - FILE *f; + FILE *f = NULL; int ret; struct add_rule_data d; - f = fopen(filename, "r"); - if (f == NULL) { - error_setg_errno(errp, errno, "Could not read blkdebug config file"); - return -errno; - } + if (filename) { + f = fopen(filename, "r"); + if (f == NULL) { + error_setg_errno(errp, errno, "Could not read blkdebug config file"); + return -errno; + } - ret = qemu_config_parse(f, config_groups, filename); - if (ret < 0) { - error_setg(errp, "Could not parse blkdebug config file"); - ret = -EINVAL; - goto fail; + ret = qemu_config_parse(f, config_groups, filename); + if (ret < 0) { + error_setg(errp, "Could not parse blkdebug config file"); + ret = -EINVAL; + goto fail; + } } d.s = s; @@ -301,7 +303,9 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, Error **errp) fail: qemu_opts_reset(&inject_error_opts); qemu_opts_reset(&set_state_opts); - fclose(f); + if (f) { + fclose(f); + } return ret; } @@ -374,11 +378,9 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, /* Read rules from config file */ config = qemu_opt_get(opts, "config"); - if (config) { - ret = read_config(s, config, errp); - if (ret) { - goto fail; - } + ret = read_config(s, config, errp); + if (ret) { + goto fail; } /* Set initial state */