mirror of https://gitee.com/openkylin/qemu.git
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>
This commit is contained in:
parent
c64f27d4f4
commit
c389c43ee5
|
@ -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);
|
opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
monitor_printf(mon, "parsing network options '%s' failed\n",
|
|
||||||
opts_str ? opts_str : "");
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
2
net.c
2
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);
|
opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
monitor_printf(mon, "parsing network options '%s' failed\n",
|
|
||||||
opts_str ? opts_str : "");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -472,7 +472,6 @@ int qemu_config_parse(FILE *fp, const char *fname)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
if (qemu_opt_set(opts, arg, value) != 0) {
|
if (qemu_opt_set(opts, arg, value) != 0) {
|
||||||
error_report("failed to set \"%s\" for %s", arg, group);
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
|
|
5
vl.c
5
vl.c
|
@ -663,8 +663,6 @@ QemuOpts *drive_add(const char *file, const char *fmt, ...)
|
||||||
|
|
||||||
opts = qemu_opts_parse(&qemu_drive_opts, optstr, 0);
|
opts = qemu_opts_parse(&qemu_drive_opts, optstr, 0);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
fprintf(stderr, "%s: huh? duplicate? (%s)\n",
|
|
||||||
__FUNCTION__, optstr);
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
if (file)
|
if (file)
|
||||||
|
@ -3072,7 +3070,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_mon:
|
case QEMU_OPTION_mon:
|
||||||
opts = qemu_opts_parse(&qemu_mon_opts, optarg, 1);
|
opts = qemu_opts_parse(&qemu_mon_opts, optarg, 1);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
fprintf(stderr, "parse error: %s\n", optarg);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
default_monitor = 0;
|
default_monitor = 0;
|
||||||
|
@ -3080,7 +3077,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_chardev:
|
case QEMU_OPTION_chardev:
|
||||||
opts = qemu_opts_parse(&qemu_chardev_opts, optarg, 1);
|
opts = qemu_opts_parse(&qemu_chardev_opts, optarg, 1);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
fprintf(stderr, "parse error: %s\n", optarg);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -3278,7 +3274,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
case QEMU_OPTION_rtc:
|
case QEMU_OPTION_rtc:
|
||||||
opts = qemu_opts_parse(&qemu_rtc_opts, optarg, 0);
|
opts = qemu_opts_parse(&qemu_rtc_opts, optarg, 0);
|
||||||
if (!opts) {
|
if (!opts) {
|
||||||
fprintf(stderr, "parse error: %s\n", optarg);
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
configure_rtc(opts);
|
configure_rtc(opts);
|
||||||
|
|
Loading…
Reference in New Issue