From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z04oH-0007zm-UA for qemu-devel@nongnu.org; Wed, 03 Jun 2015 05:18:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z04oG-0007Qt-SQ for qemu-devel@nongnu.org; Wed, 03 Jun 2015 05:18:05 -0400 From: Markus Armbruster Date: Wed, 3 Jun 2015 11:17:53 +0200 Message-Id: <1433323076-9264-7-git-send-email-armbru@redhat.com> In-Reply-To: <1433323076-9264-1-git-send-email-armbru@redhat.com> References: <1433323076-9264-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v2 6/9] blkdebug: Simplify passing of Error through qemu_opts_foreach() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, qemu-block@nongnu.org Cc: Kevin Wolf Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Acked-by: Kevin Wolf --- block/blkdebug.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/block/blkdebug.c b/block/blkdebug.c index be0d273..1e92607 100644 --- a/block/blkdebug.c +++ b/block/blkdebug.c @@ -216,7 +216,6 @@ static int get_event_by_name(const char *name, BlkDebugEvent *event) struct add_rule_data { BDRVBlkdebugState *s; int action; - Error **errp; }; static int add_rule(void *opaque, QemuOpts *opts, Error **errp) @@ -230,10 +229,10 @@ static int add_rule(void *opaque, QemuOpts *opts, Error **errp) /* Find the right event for the rule */ event_name = qemu_opt_get(opts, "event"); if (!event_name) { - error_setg(d->errp, "Missing event name for rule"); + error_setg(errp, "Missing event name for rule"); return -1; } else if (get_event_by_name(event_name, &event) < 0) { - error_setg(d->errp, "Invalid event name \"%s\"", event_name); + error_setg(errp, "Invalid event name \"%s\"", event_name); return -1; } @@ -319,8 +318,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, d.s = s; d.action = ACTION_INJECT_ERROR; - d.errp = &local_err; - qemu_opts_foreach(&inject_error_opts, add_rule, &d, NULL); + qemu_opts_foreach(&inject_error_opts, add_rule, &d, &local_err); if (local_err) { error_propagate(errp, local_err); ret = -EINVAL; @@ -328,7 +326,7 @@ static int read_config(BDRVBlkdebugState *s, const char *filename, } d.action = ACTION_SET_STATE; - qemu_opts_foreach(&set_state_opts, add_rule, &d, NULL); + qemu_opts_foreach(&set_state_opts, add_rule, &d, &local_err); if (local_err) { error_propagate(errp, local_err); ret = -EINVAL; -- 1.9.3