From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41764) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDJ7e-0007Xw-7E for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SDJ7Z-0003Tq-IT for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14514) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SDJ7Z-0003Ta-AN for qemu-devel@nongnu.org; Thu, 29 Mar 2012 13:26:49 -0400 From: Luiz Capitulino Date: Thu, 29 Mar 2012 14:26:34 -0300 Message-Id: <1333042003-15490-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1333042003-15490-1-git-send-email-lcapitulino@redhat.com> References: <1333042003-15490-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 04/13] qemu-option: parse_option_size(): use error_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, aliguori@us.ibm.com, kraxel@redhat.com, stefanha@linux.vnet.ibm.com, armbru@redhat.com Signed-off-by: Luiz Capitulino --- qemu-option.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index a8b50af..61354af 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -203,7 +203,8 @@ static void parse_option_number(const char *name, const char *value, } } -static int parse_option_size(const char *name, const char *value, uint64_t *ret) +static void parse_option_size(const char *name, const char *value, + uint64_t *ret, Error **errp) { char *postfix; double sizef; @@ -229,16 +230,14 @@ static int parse_option_size(const char *name, const char *value, uint64_t *ret) *ret = (uint64_t) sizef; break; default: - qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size"); error_printf_unless_qmp("You may use k, M, G or T suffixes for " "kilobytes, megabytes, gigabytes and terabytes.\n"); - return -1; + return; } } else { - qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); - return -1; + error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size"); } - return 0; } /* @@ -291,8 +290,10 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, break; case OPT_SIZE: - if (parse_option_size(name, value, &list->value.n) == -1) - return -1; + parse_option_size(name, value, &list->value.n, &local_err); + if (error_is_set(&local_err)) { + goto exit_err; + } break; default: @@ -602,7 +603,8 @@ static int qemu_opt_parse(QemuOpt *opt) &local_err); break; case QEMU_OPT_SIZE: - return parse_option_size(opt->name, opt->str, &opt->value.uint); + parse_option_size(opt->name, opt->str, &opt->value.uint, &local_err); + break; default: abort(); } -- 1.7.9.2.384.g4a92a