commit fb4309695905de889d318caec8eb13d3b2c118d5
author Stefan Weil <sw@weilnetz.de> Wed Jul 22 19:53:30 2015 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Fri Jul 24 13:57:45 2015 +0200
tree d7dfdbd0efb960bbcd1aa830067c0b9296e57cfa
parent 7d99f4c1b5d12de7644a5bd8c3d46bff05c9ca7c

vl: Fix compiler warning for builds without VNC

This regression was caused by commit 70b94331.

  CC    vl.o
vl.c: In function ‘select_display’:
vl.c:2064:12: error: unused variable ‘err’ [-Werror=unused-variable]
     Error *err = NULL;
            ^

Reported-by: Claudio Fontana <claudio.fontana@huawei.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <1437587610-26433-1-git-send-email-sw@weilnetz.de>
Reviewed-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

vl.c

diff --git a/vl.c b/vl.c
index 5856396..0adbbd6 100644
--- a/vl.c
+++ b/vl.c
@@ -2061,7 +2061,6 @@
 
 static DisplayType select_display(const char *p)
 {
-    Error *err = NULL;
     const char *opts;
     DisplayType display = DT_DEFAULT;
 
@@ -2130,6 +2129,7 @@
     } else if (strstart(p, "vnc", &opts)) {
 #ifdef CONFIG_VNC
         if (*opts == '=') {
+            Error *err = NULL;
             if (vnc_parse(opts + 1, &err) == NULL) {
                 error_report_err(err);
                 exit(1);