diff mbox

[for-2.4] vl: Fix compiler warning for builds without VLC

Message ID 1437587610-26433-1-git-send-email-sw@weilnetz.de
State Accepted
Headers show

Commit Message

Stefan Weil July 22, 2015, 5:53 p.m. UTC 
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;
            ^
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 vl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Wen Congyang July 23, 2015, 1:43 a.m. UTC | #1 
On 07/23/2015 01:53 AM, Stefan Weil wrote:
> This regression was caused by commit 70b94331.

vnc, not vlc in the title.

Reviewed-by: Wen Congyang <wency@cn.fujitsu.com>

> 
>   CC    vl.o
> vl.c: In function ‘select_display’:
> vl.c:2064:12: error: unused variable ‘err’ [-Werror=unused-variable]
>      Error *err = NULL;
>             ^
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  vl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/vl.c b/vl.c
> index 5856396..0adbbd6 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -2061,7 +2061,6 @@ static void select_vgahw (const char *p)
>  
>  static DisplayType select_display(const char *p)
>  {
> -    Error *err = NULL;
>      const char *opts;
>      DisplayType display = DT_DEFAULT;
>  
> @@ -2130,6 +2129,7 @@ static DisplayType select_display(const char *p)
>      } 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);
>
Paolo Bonzini July 23, 2015, 5:37 a.m. UTC | #2 
On 23/07/2015 03:43, Wen Congyang wrote:
> On 07/23/2015 01:53 AM, Stefan Weil wrote:
>> > This regression was caused by commit 70b94331.
> vnc, not vlc in the title.
> 
> Reviewed-by: Wen Congyang <wency@cn.fujitsu.com>
> 

Thanks, queued for 2.4.

Paolo
diff mbox

Patch

diff --git a/vl.c b/vl.c
index 5856396..0adbbd6 100644
--- a/vl.c
+++ b/vl.c
@@ -2061,7 +2061,6 @@  static void select_vgahw (const char *p)
 
 static DisplayType select_display(const char *p)
 {
-    Error *err = NULL;
     const char *opts;
     DisplayType display = DT_DEFAULT;
 
@@ -2130,6 +2129,7 @@  static DisplayType select_display(const char *p)
     } 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);