diff options
Diffstat (limited to 'block/blkdebug.c')
| -rw-r--r-- | block/blkdebug.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c index acf23f2f07..0bf3bb518a 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -271,11 +271,13 @@ static void remove_rule(BlkdebugRule *rule) g_free(rule); } -static int read_config(BDRVBlkdebugState *s, const char *filename, Error **errp) +static int read_config(BDRVBlkdebugState *s, const char *filename, + QDict *options, Error **errp) { FILE *f = NULL; int ret; struct add_rule_data d; + Error *local_err = NULL; if (filename) { f = fopen(filename, "r"); @@ -292,6 +294,13 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, Error **errp) } } + qemu_config_parse_qdict(options, config_groups, &local_err); + if (error_is_set(&local_err)) { + error_propagate(errp, local_err); + ret = -EINVAL; + goto fail; + } + d.s = s; d.action = ACTION_INJECT_ERROR; qemu_opts_foreach(&inject_error_opts, add_rule, &d, 0); @@ -376,9 +385,9 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } - /* Read rules from config file */ + /* Read rules from config file or command line options */ config = qemu_opt_get(opts, "config"); - ret = read_config(s, config, errp); + ret = read_config(s, config, options, errp); if (ret) { goto fail; } |