[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options |
Date: |
Fri, 20 May 2016 17:28:39 -0300 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
vl.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/vl.c b/vl.c
index 0228843..bc22903 100644
--- a/vl.c
+++ b/vl.c
@@ -2151,11 +2151,7 @@ static DisplayType select_display(const char *p)
#endif
} else if (strstart(p, "vnc", &opts)) {
if (*opts == '=') {
- Error *err = NULL;
- if (vnc_parse(opts + 1, &err) == NULL) {
- error_report_err(err);
- exit(1);
- }
+ vnc_parse(opts + 1, &error_fatal);
} else {
error_report("VNC requires a display argument vnc=<display>");
exit(1);
@@ -3709,15 +3705,8 @@ int main(int argc, char **argv, char **envp)
}
break;
case QEMU_OPTION_vnc:
- {
- Error *local_err = NULL;
-
- if (vnc_parse(optarg, &local_err) == NULL) {
- error_report_err(local_err);
- exit(1);
- }
+ vnc_parse(optarg, &error_fatal);
break;
- }
case QEMU_OPTION_no_acpi:
acpi_enabled = 0;
break;
--
2.5.5
- [Qemu-devel] [PULL 00/21] Machine Core queue, 2016-05-20, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 19/21] vl: Use &error_fatal when parsing VNC options,
Eduardo Habkost <=
- [Qemu-devel] [PULL 07/21] curses: curses_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 09/21] cocoa: cocoa_display_init() stub, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 08/21] sdl: Initialization stubs, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 18/21] machine: add properties to compat_props incrementaly, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 21/21] Use &error_fatal when initializing crypto on qemu-{img, io, nbd}, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 02/21] vl: Use exit(1) when requested VGA interface is unavailable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 01/21] pc-dimm: correct comment of MemoryHotplugState, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 16/21] vl: Make display_remote a local variable, Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 03/21] vl: Table-based select_vgahw(), Eduardo Habkost, 2016/05/20
- [Qemu-devel] [PULL 04/21] vl: Replace *_vga_available() functions with class_names field, Eduardo Habkost, 2016/05/20