From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjtJr-0005gp-Hr for qemu-devel@nongnu.org; Fri, 22 Nov 2013 11:11:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjtJl-0006Qy-Dk for qemu-devel@nongnu.org; Fri, 22 Nov 2013 11:10:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjtJl-0006Qr-4W for qemu-devel@nongnu.org; Fri, 22 Nov 2013 11:10:53 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rAMGApoO014834 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Nov 2013 11:10:52 -0500 From: Max Reitz Date: Fri, 22 Nov 2013 17:10:56 +0100 Message-Id: <1385136658-16347-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1385136658-16347-1-git-send-email-mreitz@redhat.com> References: <1385136658-16347-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v2 5/7] blkdebug: Always call read_config() 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 Move the check whether there actually is a config file into the read_config() function. Signed-off-by: Max Reitz --- block/blkdebug.c | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index b50db9d..1db999b 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -273,23 +273,25 @@ 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 " - "'%s'", filename); - return -errno; - } + if (filename) { + f = fopen(filename, "r"); + if (f == NULL) { + error_setg_errno(errp, errno, "Could not read blkdebug config file " + "'%s'", filename); + return -errno; + } - ret = qemu_config_parse(f, config_groups, filename); - if (ret < 0) { - error_setg(errp, "Could not parse blkdebug config file '%s'", - filename); - ret = -EINVAL; - goto fail; + ret = qemu_config_parse(f, config_groups, filename); + if (ret < 0) { + error_setg(errp, "Could not parse blkdebug config file '%s'", + filename); + ret = -EINVAL; + goto fail; + } } d.s = s; @@ -303,7 +305,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; } @@ -376,11 +380,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 */ -- 1.8.4.2