aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2010-03-25 17:22:35 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-04-18 23:46:48 +0200
commitc389c43ee517fbfb8b18ebb520fb4c707e10646e (patch)
tree894600562ebe32268b5b2c39a9bc4af34d909178
parentc64f27d4f44192579087caa3ec4bd6552caef169 (diff)
error: Drop extra messages after qemu_opts_set() and qemu_opts_parse()
Both functions report errors nicely enough now, no need for additional messages. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
-rw-r--r--hw/pci-hotplug.c2
-rw-r--r--net.c2
-rw-r--r--qemu-config.c1
-rw-r--r--vl.c5
4 files changed, 0 insertions, 10 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index eb3701bc8..343fd1703 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 b66ec7dba..96e10b140 100644
--- a/net.c
+++ b/net.c
@@ -1169,8 +1169,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 150157ca7..d4a2f43ff 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 4fb55b89e..2f6c16725 100644
--- a/vl.c
+++ b/vl.c
@@ -663,8 +663,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)
@@ -3072,7 +3070,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;
@@ -3080,7 +3077,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;
@@ -3278,7 +3274,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);