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>
This commit is contained in:
parent
7d99f4c1b5
commit
fb43096959
2
vl.c
2
vl.c
@ -2061,7 +2061,6 @@ static void select_vgahw (const char *p)
|
|||||||
|
|
||||||
static DisplayType select_display(const char *p)
|
static DisplayType select_display(const char *p)
|
||||||
{
|
{
|
||||||
Error *err = NULL;
|
|
||||||
const char *opts;
|
const char *opts;
|
||||||
DisplayType display = DT_DEFAULT;
|
DisplayType display = DT_DEFAULT;
|
||||||
|
|
||||||
@ -2130,6 +2129,7 @@ static DisplayType select_display(const char *p)
|
|||||||
} else if (strstart(p, "vnc", &opts)) {
|
} else if (strstart(p, "vnc", &opts)) {
|
||||||
#ifdef CONFIG_VNC
|
#ifdef CONFIG_VNC
|
||||||
if (*opts == '=') {
|
if (*opts == '=') {
|
||||||
|
Error *err = NULL;
|
||||||
if (vnc_parse(opts + 1, &err) == NULL) {
|
if (vnc_parse(opts + 1, &err) == NULL) {
|
||||||
error_report_err(err);
|
error_report_err(err);
|
||||||
exit(1);
|
exit(1);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user