From: Eduardo Habkost <ehabkost@redhat.com>
Date: Thu, 12 May 2016 14:09:59 +0000 (-0300)
Subject: vl: Use &error_fatal when parsing VNC options
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b1ee0f2b732029c7826125f6b6eb6e1e2d4fd22;p=qemu.git

vl: Use &error_fatal when parsing VNC options

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---

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;