Commit ea73f370 authored by Christophe de Dinechin's avatar Christophe de Dinechin Committed by Dr. David Alan Gilbert
Browse files

Fix build error when VNC is configured out 



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);
     |                 ^~~~~~~

Signed-off-by: default avatarChristophe de Dinechin <dinechin@redhat.com>
Message-Id: <20190625123905.25434-1-dinechin@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 298ad7b5

monitor/hmp-cmds.c

+1 −1
Original line number Diff line number Diff line
@@ -1962,7 +1962,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");
@@ -1980,6 +1979,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;

            }