mirror of https://github.com/proxmox/mirror_qemu
vl: Clean up error reporting in mon_init_func()
Calling error_report() in a function that takes an Error ** argument is suspicious. mon_init_func() does that, and then fails without setting an error. Its caller main(), via qemu_opts_foreach(), is fine with it, but clean it up anyway. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20181017082702.5581-23-armbru@redhat.com>master
parent
702832b8c0
commit
2d5a3a8b02
14
vl.c
14
vl.c
|
@ -2270,8 +2270,8 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
||||||
} else if (strcmp(mode, "control") == 0) {
|
} else if (strcmp(mode, "control") == 0) {
|
||||||
flags = MONITOR_USE_CONTROL;
|
flags = MONITOR_USE_CONTROL;
|
||||||
} else {
|
} else {
|
||||||
error_report("unknown monitor mode \"%s\"", mode);
|
error_setg(errp, "unknown monitor mode \"%s\"", mode);
|
||||||
exit(1);
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (qemu_opt_get_bool(opts, "pretty", 0))
|
if (qemu_opt_get_bool(opts, "pretty", 0))
|
||||||
|
@ -2285,8 +2285,8 @@ static int mon_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
||||||
chardev = qemu_opt_get(opts, "chardev");
|
chardev = qemu_opt_get(opts, "chardev");
|
||||||
chr = qemu_chr_find(chardev);
|
chr = qemu_chr_find(chardev);
|
||||||
if (chr == NULL) {
|
if (chr == NULL) {
|
||||||
error_report("chardev \"%s\" not found", chardev);
|
error_setg(errp, "chardev \"%s\" not found", chardev);
|
||||||
exit(1);
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
monitor_init(chr, flags);
|
monitor_init(chr, flags);
|
||||||
|
@ -4413,10 +4413,8 @@ int main(int argc, char **argv, char **envp)
|
||||||
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
|
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
|
||||||
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
|
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
|
||||||
|
|
||||||
if (qemu_opts_foreach(qemu_find_opts("mon"),
|
qemu_opts_foreach(qemu_find_opts("mon"),
|
||||||
mon_init_func, NULL, NULL)) {
|
mon_init_func, NULL, &error_fatal);
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
|
if (foreach_device_config(DEV_SERIAL, serial_parse) < 0)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
Loading…
Reference in New Issue