aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-05-12 11:09:59 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:55 -0300
commit7b1ee0f2b732029c7826125f6b6eb6e1e2d4fd22 (patch)
tree9a19417f3da8c84e955f69356b60c85cfe73e905
parentbacc344c548ce165a0001276ece56ee4b0bddae3 (diff)
vl: Use &error_fatal when parsing VNC options
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--vl.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/vl.c b/vl.c
index 0228843822..bc229030f6 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;