From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsIf7-0008Td-EZ for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:33 -0400 Received: from [199.232.76.173] (port=40355 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsIf6-0008SG-6t for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:32 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsIf1-0005Ms-8W for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:32 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:56561) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NsIey-0005MQ-B7 for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:24 -0400 Received: from blackfin.pond.sub.org (pD9E3ACC8.dip.t-dialin.net [217.227.172.200]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 268CF2DD35B for ; Thu, 18 Mar 2010 17:33:22 +0100 (CET) From: Markus Armbruster Date: Thu, 18 Mar 2010 17:33:12 +0100 Message-Id: <1268929996-28763-6-git-send-email-armbru@redhat.com> In-Reply-To: <1268929996-28763-1-git-send-email-armbru@redhat.com> References: <1268929996-28763-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 05/11] error: Convert qemu_opts_set() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lcapitulino@redhat.com Signed-off-by: Markus Armbruster --- qemu-option.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index e3916be..5c39666 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -176,7 +176,7 @@ static int parse_option_bool(const char *name, const char *value, int *ret) } else if (!strcmp(value, "off")) { *ret = 0; } else { - fprintf(stderr, "Option '%s': Use 'on' or 'off'\n", name); + qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "'on' or 'off'"); return -1; } } else { @@ -193,12 +193,12 @@ static int parse_option_number(const char *name, const char *value, uint64_t *re if (value != NULL) { number = strtoull(value, &postfix, 0); if (*postfix != '\0') { - fprintf(stderr, "Option '%s' needs a number as parameter\n", name); + qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a number"); return -1; } *ret = number; } else { - fprintf(stderr, "Option '%s' needs a parameter\n", name); + qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a number"); return -1; } return 0; @@ -226,13 +226,11 @@ static int parse_option_size(const char *name, const char *value, uint64_t *ret) *ret = (uint64_t) sizef; break; default: - fprintf(stderr, "Option '%s' needs size as parameter\n", name); - fprintf(stderr, "You may use k, M, G or T suffixes for " - "kilobytes, megabytes, gigabytes and terabytes.\n"); + qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); return -1; } } else { - fprintf(stderr, "Option '%s' needs a parameter\n", name); + qerror_report(QERR_INVALID_PARAMETER_VALUE, name, "a size"); return -1; } return 0; @@ -581,8 +579,7 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const char *value) if (i == 0) { /* empty list -> allow any */; } else { - fprintf(stderr, "option \"%s\" is not valid for %s\n", - name, opts->list->name); + qerror_report(QERR_INVALID_PARAMETER, name); return -1; } } @@ -598,8 +595,6 @@ int qemu_opt_set(QemuOpts *opts, const char *name, const char *value) opt->str = qemu_strdup(value); } if (qemu_opt_parse(opt) < 0) { - fprintf(stderr, "Failed to parse \"%s\" for \"%s.%s\"\n", opt->str, - opts->list->name, opt->name); qemu_opt_del(opt); return -1; } -- 1.6.6.1