From patchwork Thu Mar 18 16:33:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 48068 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 521DCB7D41 for ; Fri, 19 Mar 2010 04:02:42 +1100 (EST) Received: from localhost ([127.0.0.1]:39120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsJ5F-0003am-U2 for incoming@patchwork.ozlabs.org; Thu, 18 Mar 2010 13:00:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NsIf5-0008RV-JB for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:32 -0400 Received: from [199.232.76.173] (port=40352 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NsIf3-0008PB-Ff for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:29 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NsIez-0005Mj-3e for qemu-devel@nongnu.org; Thu, 18 Mar 2010 12:33:29 -0400 Received: from oxygen.pond.sub.org ([213.239.205.148]:56560) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NsIey-0005MO-B3 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 24F452DD359 for ; Thu, 18 Mar 2010 17:33:22 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id D6FF1CD; Thu, 18 Mar 2010 17:33:16 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 18 Mar 2010 17:33:13 +0100 Message-Id: <1268929996-28763-7-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1268929996-28763-1-git-send-email-armbru@redhat.com> References: <1268929996-28763-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH 06/11] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse() 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 Both functions report errors nicely enough now, no need for additional messages. Signed-off-by: Markus Armbruster --- hw/pci-hotplug.c | 2 -- net.c | 2 -- qemu-config.c | 1 - vl.c | 5 ----- 4 files changed, 0 insertions(+), 10 deletions(-) diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index eb3701b..343fd17 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -56,8 +56,6 @@ static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0); if (!opts) { - monitor_printf(mon, "parsing network options '%s' failed\n", - opts_str ? opts_str : ""); return NULL; } diff --git a/net.c b/net.c index 1092bdc..9338f35 100644 --- a/net.c +++ b/net.c @@ -1161,8 +1161,6 @@ void net_host_device_add(Monitor *mon, const QDict *qdict) opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0); if (!opts) { - monitor_printf(mon, "parsing network options '%s' failed\n", - opts_str ? opts_str : ""); return; } diff --git a/qemu-config.c b/qemu-config.c index 150157c..d4a2f43 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -472,7 +472,6 @@ int qemu_config_parse(FILE *fp, const char *fname) goto out; } if (qemu_opt_set(opts, arg, value) != 0) { - error_report("failed to set \"%s\" for %s", arg, group); goto out; } continue; diff --git a/vl.c b/vl.c index 01dc1aa..328b4cd 100644 --- a/vl.c +++ b/vl.c @@ -1815,8 +1815,6 @@ QemuOpts *drive_add(const char *file, const char *fmt, ...) opts = qemu_opts_parse(&qemu_drive_opts, optstr, 0); if (!opts) { - fprintf(stderr, "%s: huh? duplicate? (%s)\n", - __FUNCTION__, optstr); return NULL; } if (file) @@ -5367,7 +5365,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_mon: opts = qemu_opts_parse(&qemu_mon_opts, optarg, 1); if (!opts) { - fprintf(stderr, "parse error: %s\n", optarg); exit(1); } default_monitor = 0; @@ -5375,7 +5372,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_chardev: opts = qemu_opts_parse(&qemu_chardev_opts, optarg, 1); if (!opts) { - fprintf(stderr, "parse error: %s\n", optarg); exit(1); } break; @@ -5587,7 +5583,6 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_rtc: opts = qemu_opts_parse(&qemu_rtc_opts, optarg, 0); if (!opts) { - fprintf(stderr, "parse error: %s\n", optarg); exit(1); } configure_rtc(opts);