[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] blkdebug: Always call read_config()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 5/7] blkdebug: Always call read_config() |
Date: |
Fri, 22 Nov 2013 17:10:56 +0100 |
Move the check whether there actually is a config file into the
read_config() function.
Signed-off-by: Max Reitz <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/7] blkdebug/blkverify: Allow command-line configuration, Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 1/7] blkdebug: Use errp for read_config(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 2/7] blkdebug: Don't require sophisticated filename, Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 3/7] qdict: Add qdict_array_split(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 4/7] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 5/7] blkdebug: Always call read_config(),
Max Reitz <=
- [Qemu-devel] [PATCH v2 6/7] blkdebug: Use command-line in read_config(), Max Reitz, 2013/11/22
- [Qemu-devel] [PATCH v2 7/7] blkverify: Don't require protocol filename, Max Reitz, 2013/11/22