openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

blkdebug: Use command-line in read_config() 

Use qemu_config_parse_qdict() to parse the command-line options in
addition to the config file.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2013-12-20 19:28:07 +01:00 committed by Kevin Wolf
parent 85a040e548
commit 89f2b21e36
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
block/blkdebug.c
View File

@ -271,11 +271,13 @@ static void remove_rule(BlkdebugRule *rule)
g_free(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; FILE *f = NULL;
int ret; int ret;
struct add_rule_data d; struct add_rule_data d;
Error *local_err = NULL;
if (filename) { if (filename) {
f = fopen(filename, "r"); 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.s = s;
d.action = ACTION_INJECT_ERROR; d.action = ACTION_INJECT_ERROR;
qemu_opts_foreach(&inject_error_opts, add_rule, &d, 0); 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; goto fail;
} }
/* Read rules from config file */ /* Read rules from config file or command line options */
config = qemu_opt_get(opts, "config"); config = qemu_opt_get(opts, "config");
ret = read_config(s, config, errp); ret = read_config(s, config, options, errp);
if (ret) { if (ret) {
goto fail; goto fail;
} }