From patchwork Wed Apr 25 20:46:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 155107 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1039AB6FEA for ; Thu, 26 Apr 2012 07:23:45 +1000 (EST) Received: from localhost ([::1]:59842 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN97X-0000AB-4o for incoming@patchwork.ozlabs.org; Wed, 25 Apr 2012 16:47:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN975-0007Ob-Eh for qemu-devel@nongnu.org; Wed, 25 Apr 2012 16:47:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SN973-0002L3-8i for qemu-devel@nongnu.org; Wed, 25 Apr 2012 16:46:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28910) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SN973-0002Kw-10 for qemu-devel@nongnu.org; Wed, 25 Apr 2012 16:46:57 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q3PKksNB010308 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 25 Apr 2012 16:46:54 -0400 Received: from localhost (ovpn-116-34.ams2.redhat.com [10.36.116.34]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q3PKkqbW018016; Wed, 25 Apr 2012 16:46:53 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2012 17:46:30 -0300 Message-Id: <1335386800-28845-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1335386800-28845-1-git-send-email-lcapitulino@redhat.com> References: <1335386800-28845-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 06/16] qemu-option: qemu_opts_validate(): use error_set() 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 net_client_init() propagates the error up by calling qerror_report_err(), because its users expect QError semantics. Signed-off-by: Luiz Capitulino --- net.c | 6 +++++- qemu-option.c | 13 +++++-------- qemu-option.h | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/net.c b/net.c index 1922d8a..f5d9cc7 100644 --- a/net.c +++ b/net.c @@ -1136,10 +1136,14 @@ int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev) for (i = 0; i < NET_CLIENT_TYPE_MAX; i++) { if (net_client_types[i].type != NULL && !strcmp(net_client_types[i].type, type)) { + Error *local_err = NULL; VLANState *vlan = NULL; int ret; - if (qemu_opts_validate(opts, &net_client_types[i].desc[0]) == -1) { + qemu_opts_validate(opts, &net_client_types[i].desc[0], &local_err); + if (error_is_set(&local_err)) { + qerror_report_err(local_err); + error_free(local_err); return -1; } diff --git a/qemu-option.c b/qemu-option.c index d79acbd..3a9a5f8 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -1044,7 +1044,7 @@ QDict *qemu_opts_to_qdict(QemuOpts *opts, QDict *qdict) /* Validate parsed opts against descriptions where no * descriptions were provided in the QemuOptsList. */ -int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc) +void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp) { QemuOpt *opt; Error *local_err = NULL; @@ -1060,21 +1060,18 @@ int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc) } } if (desc[i].name == NULL) { - qerror_report(QERR_INVALID_PARAMETER, opt->name); - return -1; + error_set(errp, QERR_INVALID_PARAMETER, opt->name); + return; } opt->desc = &desc[i]; qemu_opt_parse(opt, &local_err); if (error_is_set(&local_err)) { - qerror_report_err(local_err); - error_free(local_err); - return -1; + error_propagate(errp, local_err); + return; } } - - return 0; } int qemu_opts_foreach(QemuOptsList *list, qemu_opts_loopfunc func, void *opaque, diff --git a/qemu-option.h b/qemu-option.h index 4d5b3d3..e9fbbb5 100644 --- a/qemu-option.h +++ b/qemu-option.h @@ -125,7 +125,7 @@ int qemu_opts_set(QemuOptsList *list, const char *id, const char *name, const char *value); const char *qemu_opts_id(QemuOpts *opts); void qemu_opts_del(QemuOpts *opts); -int qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc); +void qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp); int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname); QemuOpts *qemu_opts_parse(QemuOptsList *list, const char *params, int permit_abbrev); void qemu_opts_set_defaults(QemuOptsList *list, const char *params,