[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/11] error: Drop extra messages after qemu_opts_se
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 06/11] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse() |
Date: |
Thu, 18 Mar 2010 17:33:13 +0100 |
Both functions report errors nicely enough now, no need for additional
messages.
Signed-off-by: Markus Armbruster <address@hidden>
---
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);
--
1.6.6.1
- [Qemu-devel] [PATCH 00/11] monitor: New commands netdev_add, netdev_del, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 03/11] error: Convert qemu_opts_create() to QError, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 02/11] error: New QERR_DUPLICATE_ID, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 06/11] error: Drop extra messages after qemu_opts_set() and qemu_opts_parse(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 01/11] error: Put error definitions back in alphabetical order, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 08/11] error: Convert qemu_opts_validate() to QError, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 05/11] error: Convert qemu_opts_set() to QError, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 09/11] error: Convert net_client_init() to QError, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 07/11] error: Use QERR_INVALID_PARAMETER_VALUE instead of QERR_INVALID_PARAMETER, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 10/11] error: New QERR_DEVICE_IN_USE, Markus Armbruster, 2010/03/18
- [Qemu-devel] [PATCH 11/11] monitor: New commands netdev_add, netdev_del, Markus Armbruster, 2010/03/18
- [Qemu-devel] Re: [PATCH 00/11] monitor: New commands netdev_add, netdev_del, Luiz Capitulino, 2010/03/19