From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsiD5-0003tu-0O for qemu-devel@nongnu.org; Fri, 19 Mar 2010 15:50:19 -0400 Received: from [199.232.76.173] (port=42237 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsiD4-0003ti-K9 for qemu-devel@nongnu.org; Fri, 19 Mar 2010 15:50:18 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsiD2-0000Hv-MI for qemu-devel@nongnu.org; Fri, 19 Mar 2010 15:50:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28110) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NsiD2-0000Hb-0P for qemu-devel@nongnu.org; Fri, 19 Mar 2010 15:50:16 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2JJo6uK012014 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 19 Mar 2010 15:50:07 -0400 Date: Fri, 19 Mar 2010 16:50:00 -0300 From: Luiz Capitulino Message-ID: <20100319165000.24be76d6@redhat.com> In-Reply-To: <1268929996-28763-6-git-send-email-armbru@redhat.com> References: <1268929996-28763-1-git-send-email-armbru@redhat.com> <1268929996-28763-6-git-send-email-armbru@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [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: Markus Armbruster Cc: qemu-devel@nongnu.org On Thu, 18 Mar 2010 17:33:12 +0100 Markus Armbruster wrote: > > 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"); What about using error_printf_unless_qmp() to improve the error message? Although I don't like it very much it documents the code and if we feel like we're abusing it we'll have an excuse to do something more complicated like error message override. > 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; > } Not generating an error on purpose here?