From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3NdE-0007bB-8x for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W3Nd8-0000ot-0l for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W3Nd7-0000oZ-PV for qemu-devel@nongnu.org; Wed, 15 Jan 2014 05:23:25 -0500 From: Kevin Wolf Date: Wed, 15 Jan 2014 11:22:31 +0100 Message-Id: <1389781375-11774-19-git-send-email-kwolf@redhat.com> In-Reply-To: <1389781375-11774-1-git-send-email-kwolf@redhat.com> References: <1389781375-11774-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 18/42] blkdebug: Use errp for read_config() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Max Reitz Use an Error variable in the read_config() function. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- block/blkdebug.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index ebc5f13..2eb2e8b 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -271,7 +271,7 @@ static void remove_rule(BlkdebugRule *rule) g_free(rule); } -static int read_config(BDRVBlkdebugState *s, const char *filename) +static int read_config(BDRVBlkdebugState *s, const char *filename, Error **errp) { FILE *f; int ret; @@ -279,11 +279,14 @@ static int read_config(BDRVBlkdebugState *s, const char *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; } @@ -370,9 +373,8 @@ 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); - if (ret < 0) { - error_setg_errno(errp, -ret, "Could not read blkdebug config file"); + ret = read_config(s, config, errp); + if (ret) { goto fail; } } -- 1.8.1.4