[Qemu-devel] [PULL 0/1] hmp queue

[Qemu-devel] [PULL 0/1] hmp queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit 298ad7b5a4519d2ae547df46103b2f8d49ca6f95:

  Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190714' into staging (2019-07-15 09:46:15 +0100)

are available in the Git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20190715

for you to fetch changes up to ea73f37062a9012a4f151f47f2427011b18569c8:

  Fix build error when VNC is configured out (2019-07-15 11:26:26 +0100)

----------------------------------------------------------------
HMP pull 2019-07-15

Just Christophe's build fix

----------------------------------------------------------------
Christophe de Dinechin (1):
      Fix build error when VNC is configured out

 monitor/hmp-cmds.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] Fix build error when VNC is configured out

[Dr. David Alan Gilbert (git)]

From: Christophe de Dinechin <dinechin@redhat.com>

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: Christophe de Dinechin <dinechin@redhat.com>
Message-Id: <20190625123905.25434-1-dinechin@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-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 99ceb0846b..5ca3ebe942 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -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;
             }
-- 
2.21.0

Re: [Qemu-devel] [PULL 0/1] hmp queue

[Peter Maydell]

On Mon, 15 Jul 2019 at 12:15, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
>
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit 298ad7b5a4519d2ae547df46103b2f8d49ca6f95:
>
>   Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190714' into staging (2019-07-15 09:46:15 +0100)
>
> are available in the Git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20190715
>
> for you to fetch changes up to ea73f37062a9012a4f151f47f2427011b18569c8:
>
>   Fix build error when VNC is configured out (2019-07-15 11:26:26 +0100)
>
> ----------------------------------------------------------------
> HMP pull 2019-07-15
>
> Just Christophe's build fix
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.1
for any user-visible changes.

-- PMM