From patchwork Fri Feb 8 12:15:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 219135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 983492C0089 for ; Fri, 8 Feb 2013 23:55:28 +1100 (EST) Received: from localhost ([::1]:52785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U3msj-0001YW-4g for incoming@patchwork.ozlabs.org; Fri, 08 Feb 2013 07:16:41 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U3ms0-0000O7-IB for qemu-devel@nongnu.org; Fri, 08 Feb 2013 07:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U3mrw-0007AO-TC for qemu-devel@nongnu.org; Fri, 08 Feb 2013 07:15:56 -0500 Received: from oxygen.pond.sub.org ([2a01:4f8:121:10e4::3]:38999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U3mrw-00079m-NV; Fri, 08 Feb 2013 07:15:52 -0500 Received: from blackfin.pond.sub.org (p5B32B25A.dip.t-dialin.net [91.50.178.90]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 40B3BA2C77; Fri, 8 Feb 2013 13:15:50 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 81E15200AD; Fri, 8 Feb 2013 13:15:49 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 8 Feb 2013 13:15:47 +0100 Message-Id: <1360325749-1989-5-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1360325749-1989-1-git-send-email-armbru@redhat.com> References: <1360325749-1989-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a01:4f8:121:10e4::3 Cc: qemu-trivial@nongnu.org Subject: [Qemu-devel] [PATCH for-1.4 4/6] qemu-option: Disable two helpful messages that got broken recently X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org commit 8be7e7e4 and commit ec7b2ccb messed up the ordering of error message and the helpful explanation that should follow it, like this: $ qemu-system-x86_64 --nodefaults -S --vnc :0 --chardev null,id=, Identifiers consist of letters, digits, '-', '.', '_', starting with a letter. qemu-system-x86_64: -chardev null,id=,: Parameter 'id' expects an identifier $ qemu-system-x86_64 --nodefaults -S --vnc :0 --machine kvm_shadow_mem=dunno You may use k, M, G or T suffixes for kilobytes, megabytes, gigabytes and terabytes. qemu-system-x86_64: -machine kvm_shadow_mem=dunno: Parameter 'kvm_shadow_mem' expects a size Pity. Disable them for now. Signed-off-by: Markus Armbruster --- util/qemu-option.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/qemu-option.c b/util/qemu-option.c index c12e724..5a1d03c 100644 --- a/util/qemu-option.c +++ b/util/qemu-option.c @@ -231,8 +231,10 @@ static void parse_option_size(const char *name, const char *value, break; default: error_set(errp, QERR_INVALID_PARAMETER_VALUE, name, "a size"); +#if 0 /* conversion from qerror_report() to error_set() broke this: */ error_printf_unless_qmp("You may use k, M, G or T suffixes for " "kilobytes, megabytes, gigabytes and terabytes.\n"); +#endif return; } } else { @@ -771,7 +773,9 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id, if (id) { if (!id_wellformed(id)) { error_set(errp,QERR_INVALID_PARAMETER_VALUE, "id", "an identifier"); +#if 0 /* conversion from qerror_report() to error_set() broke this: */ error_printf_unless_qmp("Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.\n"); +#endif return NULL; } opts = qemu_opts_find(list, id);