From patchwork Fri Dec 20 18:28:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 304216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 829EF2C00B8 for ; Sat, 21 Dec 2013 05:29:09 +1100 (EST) Received: from localhost ([::1]:51049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu4os-0003bz-Ko for incoming@patchwork.ozlabs.org; Fri, 20 Dec 2013 13:29:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu4o8-0003O0-HH for qemu-devel@nongnu.org; Fri, 20 Dec 2013 13:28:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vu4o2-0001M0-Ho for qemu-devel@nongnu.org; Fri, 20 Dec 2013 13:28:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36569) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu4o2-0001Lp-9W for qemu-devel@nongnu.org; Fri, 20 Dec 2013 13:28:14 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rBKISDE4023619 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 20 Dec 2013 13:28:13 -0500 Received: from localhost (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rBKISAo9026765 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Fri, 20 Dec 2013 13:28:12 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Fri, 20 Dec 2013 19:28:07 +0100 Message-Id: <1387564104-15315-8-git-send-email-mreitz@redhat.com> In-Reply-To: <1387564104-15315-1-git-send-email-mreitz@redhat.com> References: <1387564104-15315-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH v7 07/24] blkdebug: Use command-line in read_config() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use qemu_config_parse_qdict() to parse the command-line options in addition to the config file. Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf --- block/blkdebug.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index acf23f2..0bf3bb5 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; }