diff options
| author | Peter Maydell | 2019-07-15 13:22:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-15 13:22:07 +0200 |
| commit | b9404bf592e7ba74180e1a54ed7a266ec6ee67f2 (patch) | |
| tree | 9f9528b84422984d092284a928e85eff30034861 | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20190714' into staging (diff) | |
| parent | Fix build error when VNC is configured out (diff) | |
| download | qemu-b9404bf592e7ba74180e1a54ed7a266ec6ee67f2.tar.gz qemu-b9404bf592e7ba74180e1a54ed7a266ec6ee67f2.tar.xz qemu-b9404bf592e7ba74180e1a54ed7a266ec6ee67f2.zip | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20190715' into staging
HMP pull 2019-07-15
Just Christophe's build fix
# gpg: Signature made Mon 15 Jul 2019 12:13:54 BST
# gpg: using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-hmp-20190715:
Fix build error when VNC is configured out
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | monitor/hmp-cmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |