diff mbox

[4/6] blkdebug: Always call read_config()

Message ID 1385060754-18821-5-git-send-email-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz Nov. 21, 2013, 7:05 p.m. UTC 
Move the check whether there actually is a config file into the
read_config() function.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/blkdebug.c | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)
diff mbox

Patch

diff --git a/block/blkdebug.c b/block/blkdebug.c
index 59d33a8..8d52173 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,12 +380,10 @@  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, &local_err);
-        if (ret) {
-            error_propagate(errp, local_err);
-            goto fail;
-        }
+    ret = read_config(s, config, &local_err);
+    if (ret) {
+        error_propagate(errp, local_err);
+        goto fail;
     }
 
     /* Set initial state */