From patchwork Thu Mar 25 16:22:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 48542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 12F0AB7F64 for ; Fri, 26 Mar 2010 03:50:29 +1100 (EST) Received: from localhost ([127.0.0.1]:55606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NuqGH-0000l7-Tb for incoming@patchwork.ozlabs.org; Thu, 25 Mar 2010 12:50:25 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nuppn-0005lh-M2 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:23:04 -0400 Received: from [140.186.70.92] (port=36053 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nuppe-0005ef-O9 for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NuppU-0001Fq-QG for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:54 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:52310) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NuppU-0001Ew-EA for qemu-devel@nongnu.org; Thu, 25 Mar 2010 12:22:44 -0400 Received: from blackfin.pond.sub.org (pD9E38AC7.dip.t-dialin.net [217.227.138.199]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 033C3276DB2 for ; Thu, 25 Mar 2010 17:22:42 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id E19DFE3; Thu, 25 Mar 2010 17:22:40 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 25 Mar 2010 17:22:34 +0100 Message-Id: <1269534160-4550-6-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1269534160-4550-1-git-send-email-armbru@redhat.com> References: <1269534160-4550-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v3 05/11] error: Convert qemu_opts_set() to QError X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Markus Armbruster --- qemu-option.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/qemu-option.c b/qemu-option.c index 12ce322..394c763 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,13 @@ 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 " + qerror_report(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; } } 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 +581,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 +597,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; }