From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjZZc-0004fq-9T for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:06:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VjZZW-0006t6-1i for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:05:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:5128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VjZZV-0006sy-P5 for qemu-devel@nongnu.org; Thu, 21 Nov 2013 14:05:49 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rALJ5msI002851 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 21 Nov 2013 14:05:48 -0500 From: Max Reitz Date: Thu, 21 Nov 2013 20:05:53 +0100 Message-Id: <1385060754-18821-6-git-send-email-mreitz@redhat.com> In-Reply-To: <1385060754-18821-1-git-send-email-mreitz@redhat.com> References: <1385060754-18821-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH 5/6] blkdebug: Use command-line in read_config() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Use qemu_config_parse_qdict() to parse the command-line options in addition to the config file. Signed-off-by: Max Reitz --- 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