From patchwork Tue Apr 17 19:36:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 153315 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 1A8A6B7093 for ; Wed, 18 Apr 2012 06:44:46 +1000 (EST) Received: from localhost ([::1]:36414 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKEDw-0008DB-UJ for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 15:38:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37437) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECf-0005SH-T3 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SKECb-0008Pz-0X for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SKECa-0008Po-Fq for qemu-devel@nongnu.org; Tue, 17 Apr 2012 15:36:36 -0400 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 q3HJaJNu019764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 17 Apr 2012 15:36:19 -0400 Received: from localhost (ovpn-113-173.phx2.redhat.com [10.3.113.173]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3HJaIhc007767; Tue, 17 Apr 2012 15:36:18 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 16:36:06 -0300 Message-Id: <1334691381-7666-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> References: <1334691381-7666-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 03/18] qemu-option: parse_option_bool(): 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 Note that set_option_parameter() callers still expect automatic error reporting with QError, so set_option_parameter() calls qerror_report_err() to keep the same semantics. Signed-off-by: Luiz Capitulino --- qemu-option.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 72dcb56..a8b50af 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -169,7 +169,8 @@ QEMUOptionParameter *get_option_parameter(QEMUOptionParameter *list, return NULL; } -static int parse_option_bool(const char *name, const char *value, bool *ret) +static void parse_option_bool(const char *name, const char *value, bool *ret, + Error **errp) { if (value != NULL) { if (!strcmp(value, "on")) { @@ -177,13 +178,11 @@ static int parse_option_bool(const char *name, const char *value, bool *ret) } else if (!strcmp(value, "off")) { *ret = 0; } else { - qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'"); - return -1; + error_set(errp,QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'"); } } else { *ret = 1; } - return 0; } static void parse_option_number(const char *name, const char *value, @@ -263,6 +262,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, const char *value) { bool flag; + Error *local_err = NULL; // Find a matching parameter list = get_option_parameter(list, name); @@ -274,8 +274,10 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, // Process parameter switch (list->type) { case OPT_FLAG: - if (parse_option_bool(name, value, &flag) == -1) - return -1; + parse_option_bool(name, value, &flag, &local_err); + if (error_is_set(&local_err)) { + goto exit_err; + } list->value.n = flag; break; @@ -299,6 +301,11 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, } return 0; + +exit_err: + qerror_report_err(local_err); + error_free(local_err); + return -1; } /* @@ -588,7 +595,8 @@ static int qemu_opt_parse(QemuOpt *opt) /* nothing */ return 0; case QEMU_OPT_BOOL: - return parse_option_bool(opt->name, opt->str, &opt->value.boolean); + parse_option_bool(opt->name, opt->str, &opt->value.boolean, &local_err); + break; case QEMU_OPT_NUMBER: parse_option_number(opt->name, opt->str, &opt->value.uint, &local_err);