From 466b49f276310952ad64485d8b9fa87a5c8a9451 Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Fri, 20 Dec 2013 19:28:01 +0100 Subject: [PATCH] blkdebug: Use errp for read_config() 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 ebc5f13464..2eb2e8beb0 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; } }