From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SV1mq-0000kz-U0 for qemu-devel@nongnu.org; Thu, 17 May 2012 10:34:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SV1mj-0001y9-7n for qemu-devel@nongnu.org; Thu, 17 May 2012 10:34:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19961) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SV1mi-0001xl-W1 for qemu-devel@nongnu.org; Thu, 17 May 2012 10:34:33 -0400 From: Luiz Capitulino Date: Thu, 17 May 2012 11:33:28 -0300 Message-Id: <1337265221-7136-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1337265221-7136-1-git-send-email-lcapitulino@redhat.com> References: <1337265221-7136-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 03/16] qemu-option: parse_option_bool(): use error_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, aliguori@us.ibm.com, lersek@redhat.com, mdroth@linux.vnet.ibm.com, armbru@redhat.com 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); -- 1.7.9.2.384.g4a92a