[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/6] blkdebug: Use command-line in read_config()
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH 5/6] blkdebug: Use command-line in read_config() |
Date: |
Thu, 21 Nov 2013 20:05:53 +0100 |
Use qemu_config_parse_qdict() to parse the command-line options in
addition to the config file.
Signed-off-by: Max Reitz <address@hidden>
---
block/blkdebug.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 8d52173..5f94ee7 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");
@@ -294,6 +296,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);
@@ -378,9 +387,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, &local_err);
+ ret = read_config(s, config, options, &local_err);
if (ret) {
error_propagate(errp, local_err);
goto fail;
--
1.8.4.2
- [Qemu-devel] [PATCH 0/6] blkdebug/blkverify: Allow command-line configuration, Max Reitz, 2013/11/21
- [Qemu-devel] [PATCH 1/6] blkdebug: Use errp for read_config(), Max Reitz, 2013/11/21
- [Qemu-devel] [PATCH 2/6] blkdebug: Don't require sophisticated filename, Max Reitz, 2013/11/21
- [Qemu-devel] [PATCH 4/6] blkdebug: Always call read_config(), Max Reitz, 2013/11/21
- [Qemu-devel] [PATCH 5/6] blkdebug: Use command-line in read_config(),
Max Reitz <=
- [Qemu-devel] [PATCH 3/6] qemu-option: Add qemu_config_parse_qdict(), Max Reitz, 2013/11/21
- [Qemu-devel] [PATCH 6/6] blkverify: Don't require protocol filename, Max Reitz, 2013/11/21