[v2] Fix build error when VNC is configured out

[Qemu-devel] [PATCH v2] Fix build error when VNC is configured out

Posted by Christophe de Dinechin 4 years, 9 months ago

In hmp_change(), the variable hmp_mon is only used
by code under #ifdef CONFIG_VNC. This results in a build
error when VNC is configured out with the default of
treating warnings as errors:

monitor/hmp-cmds.c: In function ‘hmp_change’:
monitor/hmp-cmds.c:1946:17: error: unused variable ‘hmp_mon’ [-Werror=unused-variable]
1946 |     MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
     |                 ^~~~~~~

v2: Move variable down as suggested by Philippe Mathieu-Daudé

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
---
 monitor/hmp-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index c283dde0e9..2ae784b9b8 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -1943,7 +1943,6 @@ static void hmp_change_read_arg(void *opaque, const char *password,
 
 void hmp_change(Monitor *mon, const QDict *qdict)
 {
-    MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
     const char *device = qdict_get_str(qdict, "device");
     const char *target = qdict_get_str(qdict, "target");
     const char *arg = qdict_get_try_str(qdict, "arg");
@@ -1961,6 +1960,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
         if (strcmp(target, "passwd") == 0 ||
             strcmp(target, "password") == 0) {
             if (!arg) {
+                MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
                 monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
                 return;
             }
-- 
2.21.0

Re: [Qemu-devel] [PATCH v2] Fix build error when VNC is configured out

Posted by Dr. David Alan Gilbert 4 years, 9 months ago

* Christophe de Dinechin (dinechin@redhat.com) wrote:
> In hmp_change(), the variable hmp_mon is only used
> by code under #ifdef CONFIG_VNC. This results in a build
> error when VNC is configured out with the default of
> treating warnings as errors:
> 
> monitor/hmp-cmds.c: In function ‘hmp_change’:
> monitor/hmp-cmds.c:1946:17: error: unused variable ‘hmp_mon’ [-Werror=unused-variable]
> 1946 |     MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
>      |                 ^~~~~~~
> 
> v2: Move variable down as suggested by Philippe Mathieu-Daudé
> 
> Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

> ---
>  monitor/hmp-cmds.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index c283dde0e9..2ae784b9b8 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -1943,7 +1943,6 @@ static void hmp_change_read_arg(void *opaque, const char *password,
>  
>  void hmp_change(Monitor *mon, const QDict *qdict)
>  {
> -    MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
>      const char *device = qdict_get_str(qdict, "device");
>      const char *target = qdict_get_str(qdict, "target");
>      const char *arg = qdict_get_try_str(qdict, "arg");
> @@ -1961,6 +1960,7 @@ void hmp_change(Monitor *mon, const QDict *qdict)
>          if (strcmp(target, "passwd") == 0 ||
>              strcmp(target, "password") == 0) {
>              if (!arg) {
> +                MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
>                  monitor_read_password(hmp_mon, hmp_change_read_arg, NULL);
>                  return;
>              }
> -- 
> 2.21.0
> 
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK

Re: [Qemu-devel] [PATCH v2] Fix build error when VNC is configured out

Posted by Stefano Garzarella 4 years, 9 months ago

On Tue, Jun 25, 2019 at 02:39:05PM +0200, Christophe de Dinechin wrote:
> In hmp_change(), the variable hmp_mon is only used
> by code under #ifdef CONFIG_VNC. This results in a build
> error when VNC is configured out with the default of
> treating warnings as errors:
> 
> monitor/hmp-cmds.c: In function ‘hmp_change’:
> monitor/hmp-cmds.c:1946:17: error: unused variable ‘hmp_mon’ [-Werror=unused-variable]
> 1946 |     MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
>      |                 ^~~~~~~
> 
> v2: Move variable down as suggested by Philippe Mathieu-Daudé

Should we move out this line from the commit message?
(Maybe Dave can remove it when apply)

> 
> Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
> ---
>  monitor/hmp-cmds.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>

Re: [Qemu-devel] [PATCH v2] Fix build error when VNC is configured out

Posted by Philippe Mathieu-Daudé 4 years, 9 months ago

On 6/26/19 6:49 PM, Stefano Garzarella wrote:
> On Tue, Jun 25, 2019 at 02:39:05PM +0200, Christophe de Dinechin wrote:
>> In hmp_change(), the variable hmp_mon is only used
>> by code under #ifdef CONFIG_VNC. This results in a build
>> error when VNC is configured out with the default of
>> treating warnings as errors:
>>
>> monitor/hmp-cmds.c: In function ‘hmp_change’:
>> monitor/hmp-cmds.c:1946:17: error: unused variable ‘hmp_mon’ [-Werror=unused-variable]
>> 1946 |     MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
>>      |                 ^~~~~~~
>>
>> v2: Move variable down as suggested by Philippe Mathieu-Daudé
> 
> Should we move out this line from the commit message?
> (Maybe Dave can remove it when apply)

Yes please :) It was meant to go after the '---' separator.

>>
>> Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
>> ---
>>  monitor/hmp-cmds.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Re: [Qemu-devel] [PATCH v2] Fix build error when VNC is configured out

Posted by Dr. David Alan Gilbert 4 years, 9 months ago

* Philippe Mathieu-Daudé (philmd@redhat.com) wrote:
> On 6/26/19 6:49 PM, Stefano Garzarella wrote:
> > On Tue, Jun 25, 2019 at 02:39:05PM +0200, Christophe de Dinechin wrote:
> >> In hmp_change(), the variable hmp_mon is only used
> >> by code under #ifdef CONFIG_VNC. This results in a build
> >> error when VNC is configured out with the default of
> >> treating warnings as errors:
> >>
> >> monitor/hmp-cmds.c: In function ‘hmp_change’:
> >> monitor/hmp-cmds.c:1946:17: error: unused variable ‘hmp_mon’ [-Werror=unused-variable]
> >> 1946 |     MonitorHMP *hmp_mon = container_of(mon, MonitorHMP, common);
> >>      |                 ^~~~~~~
> >>
> >> v2: Move variable down as suggested by Philippe Mathieu-Daudé
> > 
> > Should we move out this line from the commit message?
> > (Maybe Dave can remove it when apply)
> 
> Yes please :) It was meant to go after the '---' separator.

Done.

Queued.

> >>
> >> Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
> >> ---
> >>  monitor/hmp-cmds.c | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
> > 
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK